aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos4/clock.c
diff options
context:
space:
mode:
authorKukjin Kim <kgene.kim@samsung.com>2011-03-12 10:20:07 +0900
committerKukjin Kim <kgene.kim@samsung.com>2011-03-12 10:20:07 +0900
commitbe7004f73d0b42cca29cf9f1cc86f32038fd140c (patch)
tree906bfde445dd4d94e1487888440dfc31391dae30 /arch/arm/mach-exynos4/clock.c
parent604eefeb2308cda72325fd8754aecb55075ae866 (diff)
parent30fe76437bc2463b25e9a64ff1b28f293e3f3413 (diff)
downloadkernel_samsung_tuna-be7004f73d0b42cca29cf9f1cc86f32038fd140c.zip
kernel_samsung_tuna-be7004f73d0b42cca29cf9f1cc86f32038fd140c.tar.gz
kernel_samsung_tuna-be7004f73d0b42cca29cf9f1cc86f32038fd140c.tar.bz2
Merge branch 'next-exynos4-pm' into for-next
Conflicts: arch/arm/mach-exynos4/include/mach/regs-pmu.h
Diffstat (limited to 'arch/arm/mach-exynos4/clock.c')
0 files changed, 0 insertions, 0 deletions