Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Jun 2013 19:08:58 +0000 (09:08 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Jun 2013 19:08:58 +0000 (09:08 -1000)
Pull GPIO regression fix from Grant Likely:
 "It took a while to work out the correct solution to this regression.
  It is sorted now.  This branch was constructed and tested by Tony.
  I've verified that it builds and signed the tag"

* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux:
  gpio/omap: don't use linear domain mapping for OMAP1


Trivial merge