]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit
Merge branch 'next/dt-exynos4x12' into next/dt-samsung
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 19 Nov 2012 04:18:47 +0000 (13:18 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 19 Nov 2012 04:18:47 +0000 (13:18 +0900)
commit326f3abf19360014dfae968aa3ab891d25599618
treea57251231cb889e4e6b0f26d023990578b7bd98e
parentef405e04abd0d4bc3f7082d241517f6db3f5c06d
parent64a574344dadbee5d01819d9d73b594d3cbe448e
Merge branch 'next/dt-exynos4x12' into next/dt-samsung

Conflicts:
arch/arm/boot/dts/exynos4210.dtsi
arch/arm/boot/dts/exynos4210.dtsi
arch/arm/mach-exynos/mach-exynos4-dt.c