Merge branch 'next-exynos4-pm' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 12 Mar 2011 01:20:07 +0000 (10:20 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 12 Mar 2011 01:20:07 +0000 (10:20 +0900)
commitbe7004f73d0b42cca29cf9f1cc86f32038fd140c
tree906bfde445dd4d94e1487888440dfc31391dae30
parent604eefeb2308cda72325fd8754aecb55075ae866
parent30fe76437bc2463b25e9a64ff1b28f293e3f3413
Merge branch 'next-exynos4-pm' into for-next

Conflicts:
arch/arm/mach-exynos4/include/mach/regs-pmu.h
arch/arm/mach-exynos4/Makefile
arch/arm/mach-exynos4/include/mach/regs-clock.h
arch/arm/mach-exynos4/include/mach/regs-pmu.h