]> 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>
Wed, 14 May 2014 20:57:39 +0000 (05:57 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 14 May 2014 20:57:39 +0000 (05:57 +0900)
commit50cbcd44564def07914be44a2d9d7e4c4a1478f0
tree6b6e21de244da9342c84ce4020f71f912f6dba3f
parent2928db5b62b461073a9bf7547d3f0cc96f2d47f9
parentd7067f1c5fa0232001502569c6878d22308da268
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/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