im@samsung.com> 1299892807 +0900

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

Conflicts:
	arch/arm/mach-exynos4/include/mach/regs-pmu.h
YRr˘– x