]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commite22d05f5f976b47c08f2e51e5d63a8f78afe6e6e
tree0643e072ff554033dea22afa0a2f44e7b8a1ac7d
parentdafa5e414954e21e72411d18bc85bb3ef3d4f4ff
parent50531ed35f3951a5e0d5d6c4ea31b603d3852061
Merge remote-tracking branch 'mvebu/for-next'

Conflicts:
arch/arm/boot/dts/kirkwood-6281.dtsi