]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'devicetree/devicetree/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 04:10:34 +0000 (14:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 22 Aug 2013 04:10:34 +0000 (14:10 +1000)
1  2 
arch/arm/mm/init.c
arch/powerpc/kernel/prom.c

Simple merge
Simple merge