]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/hdmi-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 29 Oct 2012 13:03:33 +0000 (22:03 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 29 Oct 2012 13:03:33 +0000 (22:03 +0900)
commitc11068538994430547722dc9fb515a0ceefd5cb9
treedc53308fae6178deaa4a1e935aa1da96f2fc48dd
parentaeac72a5d520525c8a7822bddb50b8eb93a55152
parent0a9d5ac307aefbb2c772537d3fe7f75046d563ac
Merge branch 'next/hdmi-samsung' into for-next

Conflicts:
arch/arm/boot/dts/exynos5250-smdk5250.dts
arch/arm/mach-exynos/mach-exynos5-dt.c
arch/arm/boot/dts/exynos5250-smdk5250.dts
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/mach-exynos5-dt.c
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-universal_c210.c