Merge branch 'gpio-irqchip-rework' of /home/linus/linux-gpio into devel

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

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

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

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

diff --cc drivers/pinctrl/bcm/pinctrl-iproc-gpio.c
Simple merge

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

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

diff --cc drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
Simple merge

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

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

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

diff --cc drivers/pinctrl/sirf/pinctrl-atlas7.c
Simple merge

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

diff --cc drivers/pinctrl/spear/pinctrl-plgpio.c
Simple merge