]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'sunxi/sunxi/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 23:16:51 +0000 (10:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Feb 2016 23:16:51 +0000 (10:16 +1100)
1  2 
arch/arm/boot/dts/Makefile

Simple merge