Merge branch 'next/dt2' into HEAD
authorOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:37:01 +0000 (14:37 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 1 Oct 2012 21:37:01 +0000 (14:37 -0700)
commit7b27fa258c8f2670a8c09bbc6c4b2c874d155da2
treeeee3e1cbe481ac38614ab621122626bf5248372e
parenta8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5
parent6fd9b70e1b8f5d715728510b8f6e2566101143f1
Merge branch 'next/dt2' into HEAD

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