Merge remote-tracking branch 'driver-core/driver-core-next' into gpio/for-next

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

diff --cc drivers/gpio/gpio-tegra186.c
index 57185b96c1105f163f805d32e65cbd46145db15a,ef40fbe923cf30d4678eb8a6533869face7f95c4..934ab360584913afe48471be358cc53540bd01e0
--- 1/drivers/gpio/gpio-tegra186.c
--- 2/drivers/gpio/gpio-tegra186.c
+++ b/drivers/gpio/gpio-tegra186.c
@@@ -449,8 -407,6 +449,7 @@@ static int tegra186_gpio_probe(struct p
        unsigned int i, j, offset;
        struct gpio_irq_chip *irq;
        struct tegra_gpio *gpio;
-       struct resource *res;
 +      struct device_node *np;
        char **names;
        int err;