Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2008 22:39:30 +0000 (15:39 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Sep 2008 22:39:30 +0000 (15:39 -0700)
commit98d86c091534f35c4bab294451ae6bccab8e9075
tree98c9f0b80bb078405cf173f1d5cc91c72e77082d
parentd875a4b0ffad754e6d89fa561ea7dcdd79c9508b
parent4d084617fb0d025c42c242362d1f27d337e2d407
Merge branch 'master' of /linux/kernel/git/davem/sparc-2.6

Conflicts:

arch/sparc/kernel/of_device.c
arch/sparc/kernel/of_device.c
arch/sparc/kernel/sun4d_smp.c
arch/sparc64/Kconfig
arch/sparc64/kernel/of_device.c
arch/sparc64/mm/init.c