]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/dt-samsung-new' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Wed, 26 Sep 2012 01:37:31 +0000 (10:37 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 26 Sep 2012 01:37:31 +0000 (10:37 +0900)
commit59e65fdb514b774cb4838ac86f07b9d7b7241f11
tree03571641c153790072d44f65f0de81b27bac07de
parentc2d8df8d37aed9837d00cd44527dfe7c303ee6be
parent84bd48a04eff487570c9cdd91648835456ed65ac
Merge branch 'next/dt-samsung-new' into for-next

Conflicts:
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/boot/dts/exynos5250.dtsi
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/mach-exynos5-dt.c