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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

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

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

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

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

diff --cc include/linux/gpio.h
Simple merge