tree fbc8e050fb8f8d66fbb676746888080841882def
parent 965e32b18d6b6bbcb79f4a7308fc8bdb4d03e813
parent 867f503d580eafbcc342141bae53cf6a27d413b1
author Linus Torvalds <torvalds@linux-foundation.org> 1312215228 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> 1312215228 -1000

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