From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Oct 2013 19:11:40 +0000 (-0700)
Subject: Merge tag 'gpio-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw... 
X-Git-Tag: v3.12-rc4~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85f6d2dbfdc7e6c6ac955012c03ce31a8f947b94;p=kernel%2Fkernel-generic.git

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
---

85f6d2dbfdc7e6c6ac955012c03ce31a8f947b94