]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/cleanup3' into for-next
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 02:16:14 +0000 (03:16 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 02:16:14 +0000 (03:16 +0100)
commit8f7e34205f6ff50bfb30908af8aae5fd65a95d5f
treef63b7e128cab1e330016bfdea5ed69e1582e99d1
parent75e51a11f06998d148ed309b5b7c618c950ec73a
parentcfaf8fc5b59527281e9ddc2e0e04e1127936e17f
Merge branch 'next/cleanup3' into for-next

Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-omap2/board-generic.c
drivers/gpio/Makefile
15 files changed:
arch/arm/Kconfig
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-s3c2410/s3c2410.c
arch/arm/mach-s3c2416/s3c2416.c
arch/arm/mach-s3c2440/s3c2440.c
arch/arm/mach-s3c2440/s3c2442.c
arch/arm/plat-s5p/Kconfig
arch/arm/plat-s5p/irq-gpioint.c
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/include/plat/irqs.h
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/mmc/host/s3cmci.c
sound/soc/samsung/ac97.c