Merge commit 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 5 Aug 2010 00:17:29 +0000 (10:17 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 5 Aug 2010 00:17:29 +0000 (10:17 +1000)
commit42a0ae2282b512d1a8f6f020327f5f7b8f31a5ea
tree1af6ca28b88e052f9603790b259278904d2936be
parent412a4ac5e9cf7fdeb6af562c25547a9b9da7674f
parentc4b6a77663f5879de20561144716cfb675815e82
Merge commit 'kumar/next' into next
arch/powerpc/Kconfig
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/sysdev/fsl_pci.c