From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Aug 2011 16:13:48 +0000 (-1000)
Subject: Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc1~97
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a2d732f5d1a2adf38a5baaa2f27094024be65e9;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

* 'gpio/next' of git://git.secretlab.ca/git/linux-2.6:
  gpio_msm: Move Qualcomm MSM v2 gpio driver into drivers
  gpio_msm: Move Qualcomm v6 MSM driver into drivers
  msm: gpio: Fold register defs into C file
  msm: gpiomux: Move public API to public header
  msm: gpio: Remove ifdefs on gpio chip registers
  msm: gpio: Remove chip-specific register definitions
  msm: Remove chip-ifdefs for GPIO io mappings
  msm: gpio: Remove unsupported devices
  gpio: ab8500: fix MODULE_ALIAS for ab8500
  of/gpio: export of_gpio_simple_xlate
---

4a2d732f5d1a2adf38a5baaa2f27094024be65e9