aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-highbank
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-19 20:52:33 +0000
committerArnd Bergmann <arnd@arndb.de>2012-03-20 10:07:48 +0000
commitbde755679a3ba5af0d16231f8532e8373c5e2ecc (patch)
tree782fa01306ada3e084bd3c47ea1af378b97c0e16 /arch/arm/mach-highbank
parentMerge branch 'renesas/soc' into next/soc (diff)
parentARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver (diff)
downloadlinux-dev-bde755679a3ba5af0d16231f8532e8373c5e2ecc.tar.xz
linux-dev-bde755679a3ba5af0d16231f8532e8373c5e2ecc.zip
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>
Diffstat (limited to 'arch/arm/mach-highbank')
0 files changed, 0 insertions, 0 deletions