Arnd Bergmann 7c2d780ec0 Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc ... * commit '5c34a4e89c743339f78cafb2f2a826a010f0746a': ARM: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB ARM: uniphier: drop code for old DT binding These cause a harmless conflict with the clps711x multiplatform support, and it's easy to resolve. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2016-07-06 18:00:32 +02:00
..
Kconfig	Merge ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB changes into next/soc	2016-07-06 18:00:32 +02:00