| commit | be7004f73d0b42cca29cf9f1cc86f32038fd140c | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Sat Mar 12 10:20:07 2011 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Sat Mar 12 10:20:07 2011 +0900 |
| tree | 906bfde445dd4d94e1487888440dfc31391dae30 | |
| parent | 604eefeb2308cda72325fd8754aecb55075ae866 [diff] | |
| parent | 30fe76437bc2463b25e9a64ff1b28f293e3f3413 [diff] |
Merge branch 'next-exynos4-pm' into for-next Conflicts: arch/arm/mach-exynos4/include/mach/regs-pmu.h