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)
1  2 
arch/powerpc/boot/dts/mpc8308rdb.dts
arch/powerpc/sysdev/fsl_rio.c

Simple merge
Simple merge