]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'mvebu/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:07:23 +0000 (16:07 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 06:07:23 +0000 (16:07 +1000)
commitbfde891afda89af975fe00e47f4a7943ad2b3a85
tree6d72eda11de3bcd41357119b14baceea20e0d6ad
parent4927461ab9b26f79c9e550f0777aa618f774e0be
parent04864c6813219e906a90a2b3cb27accfebcfaf10
Merge remote-tracking branch 'mvebu/for-next'

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