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

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/gpio-stmpe.c
index 6dff78b19725d21612d77fcddbcb63f020f665f1,522c90ee96e88016e89e6bad868d25a1d3b90013..6411600edf6492ac7e921d4e5e35b2d7b5a13a8d
--- 1/drivers/gpio/gpio-stmpe.c
--- 2/drivers/gpio/gpio-stmpe.c
+++ b/drivers/gpio/gpio-stmpe.c
@@@ -301,9 -302,10 +302,10 @@@ static void stmpe_gpio_irq_remove(struc
        }
  }
  
 -static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
 +static int stmpe_gpio_probe(struct platform_device *pdev)
  {
        struct stmpe *stmpe = dev_get_drvdata(pdev->dev.parent);
+       struct device_node *np = pdev->dev.of_node;
        struct stmpe_gpio_platform_data *pdata;
        struct stmpe_gpio *stmpe_gpio;
        int ret;

diff --cc drivers/mfd/stmpe.c
Simple merge