From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Jun 2011 15:22:29 +0000 (-0700)
Subject: Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: firefly_0821_release~7613^2~939
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5b28f6a25ee202046e2d57bd431671bc23cf3dd1;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/samsung: make Kconfig options def_bool
  gpio/exynos4: Fix incorrect mapping of gpio pull-up macro to register setting
  GPIO: OMAP: add locking around calls to _set_gpio_triggering
  GPIO: OMAP: fix setting IRQWAKEN bits for OMAP4
  GPIO: OMAP: fix section mismatch warnings
  gpio: Fix gpio-exynos4 build fails in mainline
---

5b28f6a25ee202046e2d57bd431671bc23cf3dd1