Merge branch 'samsung/cleanup-exynos-clock' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Mon, 19 Mar 2012 20:52:33 +0000 (20:52 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Mar 2012 10:07:48 +0000 (10:07 +0000)
commitbde755679a3ba5af0d16231f8532e8373c5e2ecc
tree782fa01306ada3e084bd3c47ea1af378b97c0e16
parent62a16d025c683fe9e1eada7683095013b96ce9d1
parent44b2cef5ae6da48523fa634230ca66107110a7dd
Merge branch 'samsung/cleanup-exynos-clock' into next/soc

Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c

The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-exynos/pm.c
arch/arm/mach-s3c2440/mach-gta02.c
arch/arm/mach-s3c2440/mach-rx1950.c
arch/arm/plat-samsung/devs.c