tree 6063d27c4f0a38a10e5831882835c9d585250bd1
parent 54af2bd25cd489fe9facca15d18a2ca7e070ab2f
parent 2345b20fd9160d99f7cdf34e7b028ea351bf9c25
author Linus Torvalds <torvalds@linux-foundation.org> 1310140871 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1310140871 -0700

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