commit 5ad27d6ca5d4278120833f1d3e24acdb57afff0b
author Linus Torvalds <torvalds@linux-foundation.org> Sun Nov 18 08:32:59 2012 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Nov 18 08:32:59 2012 -1000
tree 306b23139a8cbc66256a0d0fc4e46e3c00bf0c50
parent d28d3730fd377cf275a7ac00457ff5012841ee96
parent cbf24fad8e6e97b7cd7dd1099f5b801689dc234a

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

Pull last minute GPIO fixes from Linus Walleij:

 - Disable blinking on the Orion GPIO driver

 - Two Kconfig-style fixes to avoid broken builds

* tag 'gpio-fixes-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio-mcp23s08: Build I2C support even when CONFIG_I2C=m
  gpio: adnp: Depend on OF_GPIO instead of OF
  mvebu-gpio: Disable blinking when enabling a GPIO for output