Merge branch 'samsung/exynos-multiplatform' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 12:34:05 +0000 (14:34 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 19 Apr 2013 14:50:56 +0000 (16:50 +0200)
commit0dc488e778069b208d09516c5f0793dc37023c8e
tree704ad7fa4d8202f1933297e4dd348128a2b9f702
parentc4c54da24b8ae12abb2034edaf08021894caf0d0
parentbd51de53e1be9896d815bbea30560262216d4616
Merge branch 'samsung/exynos-multiplatform' into next/drivers

Merging this into the next/drivers branch avoids a number of
pointless conflicts with code changed here.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
14 files changed:
arch/arm/Kconfig
arch/arm/mach-exynos/Kconfig
arch/arm/mach-exynos/Makefile
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/include/mach/irqs.h
arch/arm/mach-exynos/mach-armlex4210.c
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdk4x12.c
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/devs.c
drivers/gpio/Makefile