Merge remote branch 'kumar/next' into merge
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 Jan 2011 00:00:44 +0000 (11:00 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 21 Jan 2011 00:00:44 +0000 (11:00 +1100)
commit50f4df4e6a7ae111fd9b8fada4155675a4410e99
treea174a42f1f38660d0c4d3c4e81e5bb1e14fab0d1
parent12fcdba1b7ae8b25696433f420b775aeb556d89b
parentb49d81ded47e9d01f7128fce50d224ccc2150960
Merge remote branch 'kumar/next' into merge
arch/powerpc/boot/dts/mpc8308rdb.dts
arch/powerpc/sysdev/fsl_rio.c