Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000 (20:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 12 Sep 2009 03:35:13 +0000 (20:35 -0700)
commitcabc5c0f7fa1342049042d6e147db5a73773955b
tree2be09ae1777d580c7dfe05d6d5b76e57281ec447
parentb73d884756303316ead4cd7dad51236b2a515a1a
parent86d710146fb9975f04c505ec78caa43d227c1018
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
arch/sparc/Kconfig
arch/sparc/Kconfig
arch/sparc/kernel/Makefile
arch/sparc/kernel/ioport.c
arch/sparc/kernel/nmi.c