]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'v3.16-next/dt-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 19 May 2014 16:32:27 +0000 (01:32 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 19 May 2014 16:32:27 +0000 (01:32 +0900)
commit574685f83247eec6189af6368143de94460241d1
tree291559e735b5a5727cf38e4e55a87c363f947b0b
parent544cd326d7d10bf76a2c3f5789542895fe45ddf1
parentb5839bd87f197e133a0025c36df286eab6e1d858
Merge branch 'v3.16-next/dt-samsung' into for-next

Conflicts:
arch/arm/mach-exynos/firmware.c
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/exynos4412-trats2.dts
arch/arm/boot/dts/exynos5420-arndale-octa.dts
arch/arm/boot/dts/exynos5420.dtsi
arch/arm/mach-exynos/common.h
arch/arm/mach-exynos/exynos.c
arch/arm/mach-exynos/firmware.c
arch/arm/mach-exynos/platsmp.c