Merge branch 'exynos/iommu' into next/soc2
authorArnd Bergmann <arnd@arndb.de>
Tue, 15 May 2012 14:50:36 +0000 (16:50 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 15 May 2012 14:50:36 +0000 (16:50 +0200)
commit3d0c872ab4fbef94cf06e53e7a7b06357459e21b
treee586bb92d36bafccc61427bc49eae92e8528175c
parent090a80cba39f2763a488b6f7c65e38922d5aa17a
parent2a96536e77b43cf1e70ab3ad8b46b98ab52b56c1
Merge branch 'exynos/iommu' into next/soc2

This is a dependency for the following samsung changes.

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