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)
commite9308cfd5ab4ade3d81cf591c7599c3a05a21b04
treed1ca7c4ee3ba7d563d83af5b20ac25c30817bd19
parent480082968a78151e731ebd304eeb6cada61a1cd1
parent25fcf2b7f1f65d2cc12182ced3ccd47576970be4
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6

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