Merge branch 'cleanup/kconfig' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 18 Mar 2014 15:25:47 +0000 (16:25 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 18 Mar 2014 15:25:47 +0000 (16:25 +0100)
commita65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d
treeff2025ad147593b78b6b93b13727021a8ccc6a56
parent9ad2a24f370159c350e9ec5dd3b91a1f3d76234e
parent4b8b5f25b7485eaf60a40f68451b3b7b741eef59
Merge branch 'cleanup/kconfig' into next/drivers

This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-omap2/Kconfig
arch/arm/mach-sti/Kconfig