| commit | bde755679a3ba5af0d16231f8532e8373c5e2ecc | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Mar 19 20:52:33 2012 +0000 |
| committer | Arnd Bergmann <arnd@arndb.de> | Tue Mar 20 10:07:48 2012 +0000 |
| tree | 782fa01306ada3e084bd3c47ea1af378b97c0e16 | |
| parent | 62a16d025c683fe9e1eada7683095013b96ce9d1 [diff] | |
| parent | 44b2cef5ae6da48523fa634230ca66107110a7dd [diff] |
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>