]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'samsung/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:44:07 +0000 (14:44 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 30 Oct 2012 03:44:07 +0000 (14:44 +1100)
commit7a19b726ed06964c4bc40c940267850d7ff7e033
tree28186d3ea05585b5b382610a240b83332f81795b
parentdc7936caefac48120f9d773b4cc57575768fc2ab
parentf789f1e793d8fe2ebea5a34e2a27b92691da8425
Merge remote-tracking branch 'samsung/for-next'

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