]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 03:59:37 +0000 (14:59 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 1 Nov 2012 03:59:37 +0000 (14:59 +1100)
commite20533b202c4cbf1e7768ea629d4b8ca2c3c10a1
tree5b7e6f136bd63c1a138a6b99fabf8e82de0cd58c
parentf438c5328df91a76d2b6218ed9523b383f0d2f2f
parentf789f1e793d8fe2ebea5a34e2a27b92691da8425
Merge remote-tracking branch 'samsung/for-next'

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