From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jul 2011 16:01:11 +0000 (-0700)
Subject: Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: firefly_0821_release~3680^2~5095
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=902daf6580cffe04721250fb71b5527a98718b11;p=firefly-linux-kernel-4.4.55.git

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

902daf6580cffe04721250fb71b5527a98718b11