Merge tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio

Pull GPIO changes from Linus Walleij:
 - New driver for AMD-8111 southbridge GPIOs
 - New driver for Wolfson Micro Arizona devices
 - Propagate device tree parse errors
 - Probe deferral finalizations - all expected calls to GPIO will now
   hopefully request deferral where apropriate
 - Misc updates to TCA6424, WM8994, LPC32xx, PCF857x, Samsung MXC, OMAP
   and PCA953X drivers.

Fix up gpio_idx conflicts in drivers/gpio/gpio-mxc.c

* tag 'gpio-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available
  gpiolib: Defer failed gpio requests by default
  MAINTAINERS: add entry OMAP GPIO driver
  gpio/pca953x: increase variables size to support 24 bit of data
  GPIO: PCA953X: Increase size of invert variable to support 24 bit
  gpio/omap: move bank->dbck initialization to omap_gpio_mod_init()
  gpio/mxc: use the edge_sel feature if available
  gpio: propagate of_parse_phandle_with_args errors
  gpio: samsung: add flags specifier to device-tree binding
  gpiolib: Add support for Wolfson Microelectronics Arizona class devices
  gpio: gpio-lpc32xx: Add gpio_to_irq mapping
  gpio: pcf857x: share 8/16 bit access functions
  gpio: LPC32xx: Driver cleanup
  MAINTAINERS: Add Wolfson gpiolib drivers to the Wolfson entry
  gpiolib: wm8994: Convert to devm_kzalloc()
  gpiolib: wm8994: Use irq_domain mappings for gpios
  gpio: add a driver for GPIO pins found on AMD-8111 south bridge chips
  gpio/tca6424: merge I2C transactions, remove cast
  gpio/of: fix a typo of comment message

1 files changed, 8 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 429e72cc13f..5b41de49a32 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4961,6 +4961,13 @@ S:	Maintained
 F:      drivers/usb/*/*omap*
 F:      arch/arm/*omap*/usb*
 
+OMAP GPIO DRIVER
+M:      Santosh Shilimkar <santosh.shilimkar@ti.com>
+M:      Kevin Hilman <khilman@ti.com>
+L:      linux-omap@vger.kernel.org
+S:      Maintained
+F:      drivers/gpio/gpio-omap.c
+
 OMFS FILESYSTEM
 M:      Bob Copeland <me@bobcopeland.com>
 L:      linux-karma-devel@lists.sourceforge.net
@@ -7615,6 +7622,7 @@ F:	Documentation/hwmon/wm83??
 F:      arch/arm/mach-s3c64xx/mach-crag6410*
 F:      drivers/clk/clk-wm83*.c
 F:      drivers/leds/leds-wm83*.c
+F:      drivers/gpio/gpio-*wm*.c
 F:      drivers/hwmon/wm83??-hwmon.c
 F:      drivers/input/misc/wm831x-on.c
 F:      drivers/input/touchscreen/wm831x-ts.c