Merge branch 'next-exynos4-pm' into for-next

Conflicts:
	arch/arm/mach-exynos4/include/mach/regs-pmu.h
This commit is contained in:
Kukjin Kim 2011-03-12 10:20:07 +09:00
commit be7004f73d
8 changed files with 724 additions and 18 deletions