Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2011 05:07:52 +0000 (17:07 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 14 Oct 2011 05:07:52 +0000 (17:07 +1200)
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
  gpio-pca953x: fix gpio_base
  gpio/omap: fix build error with certain OMAP1 configs


Trivial merge