Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2011 16:01:11 +0000 (09:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jul 2011 16:01:11 +0000 (09:01 -0700)
commit902daf6580cffe04721250fb71b5527a98718b11
tree6063d27c4f0a38a10e5831882835c9d585250bd1
parent54af2bd25cd489fe9facca15d18a2ca7e070ab2f
parent2345b20fd9160d99f7cdf34e7b028ea351bf9c25
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/langwell_gpio: ack the correct bit for langwell gpio interrupts