]> 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, 8 Nov 2012 03:43:38 +0000 (14:43 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 8 Nov 2012 03:43:38 +0000 (14:43 +1100)
commit31e08a07bef9e6fd8cd688cc7a32a8deab31fd33
tree8cb2fbd374faf8746c72226999a53b95e622ecf7
parentb94266caf1c0ee5169d1282dcad806c3db5c19f6
parentf789f1e793d8fe2ebea5a34e2a27b92691da8425
Merge remote-tracking branch 'samsung/for-next'

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