From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 May 2013 01:24:10 +0000 (-0700)
Subject: Merge tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linus... 
X-Git-Tag: v3.12-rc1~749
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=514e250f67d2b2a8ab08dc9c3650af19a411c926;p=kernel%2Fkernel-generic.git

Merge tag 'gpio-fixes-v3.10-1' of git://git./linux/kernel/git/linusw/linux-gpio

Pull GPIO fixes from Linus Walleij:
 - An OMAP fix that makes ethernet work again.
 - Fix for build problem when building the MCP23S08 driver as module.
 - IRQ conflicts in the Langwell driver.
 - Fix IRQ coherency issues in the MXS driver.
 - Return correct errorcode on errorpath when removing GPIO chips.

* tag 'gpio-fixes-v3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio: Don't override the error code in probe error handling
  gpio: mxs: Use set and clear capabilities of the gpio controller
  gpio-langwell: fix irq conflicts when DT is not used
  gpio: mcp23s08: Fix build error when CONFIG_SPI_MASTER=y && CONFIG_I2C=m
  gpio/omap: ensure gpio context is initialised
---

514e250f67d2b2a8ab08dc9c3650af19a411c926