]> 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, 31 Oct 2012 05:27:28 +0000 (16:27 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 31 Oct 2012 05:27:28 +0000 (16:27 +1100)
commit8d41e574d2f18f6ab212d06daa929d5a8ce29264
treef879837d7d9a3d20c75cc9bc9c896d5095e4ce6e
parent1d75794095dd0d85d3465d346770368e612c311c
parentf789f1e793d8fe2ebea5a34e2a27b92691da8425
Merge remote-tracking branch 'samsung/for-next'

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