]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2ca9c028b0006c4fd6a6a42c897fdbff5421a818
tree906bfde445dd4d94e1487888440dfc31391dae30
parentf36557fda91961f89c0a192b0286086f2e7c35f3
parent78f13e02c00195275b63b8585fe953f7df09ee4b
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