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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/Kconfig.platforms
index 4e0e1071f2e8cd9190d009f6345df616208f1621,41d82b327e6a0eeb61d24f65e0b7d1d80318b703..f14e0613b9de963098c8b5c212a3f4174bef9b06
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -163,9 -158,9 +162,10 @@@ config ARCH_TEGR
        select CLKSRC_MMIO
        select CLKSRC_OF
        select GENERIC_CLOCKEVENTS
 -      select HAVE_CLK
+       select GPIOLIB
        select PINCTRL
 +      select PM
 +      select PM_GENERIC_DOMAINS
        select RESET_CONTROLLER
        help
          This enables support for the NVIDIA Tegra SoC family.

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/gpio/gpio-mxc.c
index e38989a4fa0c6b7ce0384722a07f65154aea178b,e35af5249478b24ac02720abc3a14216c9c0109e..c1a1e00b8cb024f12d6243226fc01de4aa37064a
--- 1/drivers/gpio/gpio-mxc.c
--- 2/drivers/gpio/gpio-mxc.c
+++ b/drivers/gpio/gpio-mxc.c
@@@ -515,10 -510,4 +515,4 @@@ static int __init gpio_mxc_init(void
  {
        return platform_driver_register(&mxc_gpio_driver);
  }
 -postcore_initcall(gpio_mxc_init);
 +subsys_initcall(gpio_mxc_init);
- 
- MODULE_AUTHOR("Freescale Semiconductor, "
-             "Daniel Mack <danielncaiaq.de>, "
-             "Juergen Beisert <kernel@pengutronix.de>");
- MODULE_DESCRIPTION("Freescale MXC GPIO");
- MODULE_LICENSE("GPL");