Merge tag 'gpio-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Oct 2013 19:11:40 +0000 (12:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 5 Oct 2013 19:11:40 +0000 (12:11 -0700)
commit85f6d2dbfdc7e6c6ac955012c03ce31a8f947b94
treeda0ead1d1f0d2badd66b6ecfd0636ab22b9ab495
parent4ed547641dd0e5db0e2e49c87b85307a9fd7bee4
parentfac7fa162a19100298d5d91359960037dc5bfca9
Merge tag 'gpio-v3.12-2' of git://git./linux/kernel/git/linusw/linux-gpio

Pull GPIO fixes from Linus Walleij:
 "Two patches for the OMAP driver, dealing with setting up IRQs properly
  on the device tree boot path"

* tag 'gpio-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
  gpio/omap: auto-setup a GPIO when used as an IRQ
  gpio/omap: maintain GPIO and IRQ usage separately