]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:14:29 +0000 (10:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 00:14:29 +0000 (10:14 +1000)
1  2 
arch/arm/boot/dts/Makefile
arch/arm/mach-mvebu/Kconfig

Simple merge
Simple merge