projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12fcdba b49d81d)
Merge remote branch 'kumar/next' into merge
authorBenjamin Herrenschmidt <[email protected]>
Fri, 21 Jan 2011 00:00:44 +0000 (11:00 +1100)
committerBenjamin Herrenschmidt <[email protected]>
Fri, 21 Jan 2011 00:00:44 +0000 (11:00 +1100)
1  2 
arch/powerpc/boot/dts/mpc8308rdb.dts patch | diff1 | diff2 | blob | history
arch/powerpc/sysdev/fsl_rio.c patch | diff1 | diff2 | blob | history

diff --cc arch/powerpc/boot/dts/mpc8308rdb.dts
Simple merge
diff --cc arch/powerpc/sysdev/fsl_rio.c
Simple merge
John Crispins staging tree