tree d1ca7c4ee3ba7d563d83af5b20ac25c30817bd19
parent 480082968a78151e731ebd304eeb6cada61a1cd1
parent 25fcf2b7f1f65d2cc12182ced3ccd47576970be4
author Linus Torvalds <torvalds@linux-foundation.org> 1318568872 +1200
committer Linus Torvalds <torvalds@linux-foundation.org> 1318568872 +1200

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