]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 03:44:10 +0000 (14:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 03:44:10 +0000 (14:44 +1100)
commit27955ec1f20c2d2a1a942cbaf50124964755cd20
tree34be255767ff17199ab6cb8f7dff7b2e40c5cb6e
parentf14078ab800a056cab5478102b2ef4c4d35aed9b
parentf789f1e793d8fe2ebea5a34e2a27b92691da8425
Merge remote-tracking branch 'samsung/for-next'

Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
arch/arm/boot/dts/exynos4210.dtsi