]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:26:06 +0000 (16:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 06:26:06 +0000 (16:26 +1000)
Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi


Trivial merge