Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 22:53:34 +0000 (07:53 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 12 May 2012 22:53:34 +0000 (07:53 +0900)
commit163ec0369be4c26e68385f6cec88d0ee38c8d8e5
treef3e441866f8bc1b0548e7d8eddd9548b6aedef5e
parent199642bfe107c411f25fbfc16c9fd49cfef9785d
parent99dbdd98f271899e023d52b3f4c2bf67cdd7eb56
Merge branch 'next/cleanup-plat-s3c24xx' into next/cleanup-plat-s3c24xx-s5p
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/include/mach/irqs.h
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/include/mach/regs-clock.h
arch/arm/plat-samsung/Kconfig