Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux

Pull GPIO changes from Grant Likely:
 "The usual selection of bug fixes and driver updates for GPIO.  Nothing
  really stands out except the addition of the GRGPIO driver and some
  enhacements to ACPI support"

I'm pulling this despite the earlier mess.  Let's hope it compiles these
days.

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux: (46 commits)
  gpio: grgpio: Add irq support
  gpio: grgpio: Add device driver for GRGPIO cores
  gpiolib-acpi: introduce acpi_get_gpio_by_index() helper
  GPIO: gpio-generic: remove kfree() from bgpio_remove call
  gpio / ACPI: Handle ACPI events in accordance with the spec
  gpio: lpc32xx: Fix off-by-one valid range checking for bank
  gpio: mcp23s08: convert driver to DT
  gpio/omap: force restore if context loss is not detectable
  gpio/omap: optimise interrupt service routine
  gpio/omap: remove extra context restores in *_runtime_resume()
  gpio/omap: free irq domain in probe() failure paths
  gpio: gpio-generic: Add 16 and 32 bit big endian byte order support
  gpio: samsung: Add terminating entry for exynos_pinctrl_ids
  gpio: mvebu: add dbg_show function
  MAX7301 GPIO: Do not force SPI speed when using OF Platform
  gpio: gpio-tps65910.c: fix checkpatch error
  gpio: gpio-timberdale.c: fix checkpatch error
  gpio: gpio-tc3589x.c: fix checkpatch errors
  gpio: gpio-stp-xway.c: fix checkpatch error
  gpio: gpio-sch.c: fix checkpatch error
  ...

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

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

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

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

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

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

diff --cc drivers/gpio/gpio-samsung.c
index 99e0fa4,c4b51d8..b22ca79
--- 1/drivers/gpio/gpio-samsung.c
--- 2/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@@ -3028,8 -3024,8 +3028,9 @@@ static __init int samsung_gpiolib_init(
        static const struct of_device_id exynos_pinctrl_ids[] = {
                { .compatible = "samsung,exynos4210-pinctrl", },
                { .compatible = "samsung,exynos4x12-pinctrl", },
 +              { .compatible = "samsung,exynos5250-pinctrl", },
                { .compatible = "samsung,exynos5440-pinctrl", },
+               { }
        };
        for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
                if (pctrl_np && of_device_is_available(pctrl_np))

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

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