Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 07:28:45 +0000 (00:28 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 13 Apr 2010 07:28:45 +0000 (00:28 -0700)
commit9343af084c7e8911897b0883042ee690cee3aaef
tree6211a4bdc84690bec6530d27a3abb19f5e8bb8f3
parente182c77cc291456eed127b1472952ddb59a81a9d
parent0d0fb0f9c5fddef4a10242fe3337f00f528a3099
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
lib/Kconfig.debug
arch/sparc/kernel/smp_64.c
arch/sparc/kernel/traps_64.c
lib/Kconfig.debug