]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd72bb069c9a402af4e9f381ba3a2b351fc431672
tree704ad7fa4d8202f1933297e4dd348128a2b9f702
parente21671d49a6d0f61331eda8a9b56383b12454fd5
parent621b502786ba87443f635c24bdff4cd7ac8456ec
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