| commit | 8ec46b97f24d60645c8f708c87e0caecebd25d77 | [log] [tgz] |
|---|---|---|
| author | Kukjin Kim <kgene.kim@samsung.com> | Sat Mar 09 16:56:34 2013 +0900 |
| committer | Kukjin Kim <kgene.kim@samsung.com> | Sat Mar 09 16:56:34 2013 +0900 |
| tree | 3663c411f7a4e7a9bfc0a8e720679b93a5860b7c | |
| parent | b85b64cc22122adca695e0f8c340cc677ad92e8c [diff] | |
| parent | 6938d75a8c1a1752f9fa7ef14a0c570036c7b73b [diff] |
Merge branch 'next/mct-exynos' into next/clk-exynos Conflicts: arch/arm/mach-exynos/mach-exynos4-dt.c