Merge remote-tracking branch 'gpio-lw/for-next'

diff --cc arch/arm/Kconfig
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/gpiolib.c
Simple merge

diff --cc include/asm-generic/gpio.h
Simple merge