Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 19 May 2011 07:00:06 +0000 (17:00 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Thu, 19 May 2011 07:00:06 +0000 (17:00 +1000)
commit4c8440666b995f20604852b35dcfdbcc1d5931f1
treeb3b6cd65ee275ba1adf9d2c050063f30ebbadb91
parent751e1f5099f1568444fe2485f2485ca541d4952e
parentc560bbceaf6b06e52f1ef20131b76a3fdc0a2c19
Merge branch 'merge' into next
arch/powerpc/kernel/smp.c
arch/powerpc/sysdev/fsl_msi.c