From: Kukjin Kim <kgene.kim@samsung.com>
Date: Sat, 12 Mar 2011 01:20:07 +0000 (+0900)
Subject: Merge branch 'next-exynos4-pm' into for-next
X-Git-Tag: v2.6.39-rc1~434^2^2~12
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be7004f73d0b42cca29cf9f1cc86f32038fd140c;p=pandora-kernel.git

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

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

be7004f73d0b42cca29cf9f1cc86f32038fd140c
Reading git-diff-tree failed