Merge branch 'exynos/sysmmu' into next/cleanup2
authorArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:14:43 +0000 (21:14 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 14 May 2012 19:14:43 +0000 (21:14 +0200)
commiteedd52e3c462d5434412fd0b7bc183ed76d3a4a8
tree60d239a229673658b38dcb949286ad45a4a89167
parent030caf3f22395d564ee8a4f056a9cb7190a7eed4
parentbca10b906f8d2e4f177bff047b9d623941e454f7
Merge branch 'exynos/sysmmu' into next/cleanup2

Required as a depdency for the next/cleanup-plat-s3c24xx-s5p branch

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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