diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-12 02:20:07 +0100 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-12 02:20:07 +0100 |
| commit | be7004f73d0b42cca29cf9f1cc86f32038fd140c (patch) | |
| tree | 906bfde445dd4d94e1487888440dfc31391dae30 /arch/arm/mach-kirkwood | |
| parent | ARM: S5P: Add platform definitions for FIMC3 (diff) | |
| parent | ARM: EXYNOS4: Update HRT for supporting PM (diff) | |
| download | linux-be7004f73d0b42cca29cf9f1cc86f32038fd140c.tar.xz linux-be7004f73d0b42cca29cf9f1cc86f32038fd140c.zip | |
Merge branch 'next-exynos4-pm' into for-next
Conflicts:
arch/arm/mach-exynos4/include/mach/regs-pmu.h
Diffstat (limited to 'arch/arm/mach-kirkwood')
0 files changed, 0 insertions, 0 deletions