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

diff --cc Documentation/devicetree/bindings/gpio/gpio.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

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

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

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

diff --cc drivers/pinctrl/intel/pinctrl-intel.c
Simple merge

diff --cc drivers/pinctrl/mediatek/pinctrl-mtk-common.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-at91.c
Simple merge

diff --cc drivers/pinctrl/pinctrl-rockchip.c
Simple merge

diff --cc drivers/pinctrl/sunxi/pinctrl-sunxi.c
Simple merge