From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 May 2011 19:14:41 +0000 (-0700)
Subject: Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.0-rc1~130
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b29336fe01dab3541ebb283daddf9d0168c3f05;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/via: rename VIA local config struct
  basic_mmio_gpio: split into a gpio library and platform device
  gpio: remove some legacy comments in build files
  gpio: add trace events for setting direction and value
  gpio/pca953x: Use handle_simple_irq instead of handle_edge_irq
  gpiolib: export gpiochip_find
  gpio: remove redundant Kconfig depends on GPIOLIB
  basic_mmio_gpio: convert to non-__raw* accessors
  basic_mmio_gpio: support direction registers
  basic_mmio_gpio: support different input/output registers
  basic_mmio_gpio: detect output method at probe time
  basic_mmio_gpio: request register regions
  basic_mmio_gpio: allow overriding number of gpio
  basic_mmio_gpio: convert to platform_{get,set}_drvdata()
  basic_mmio_gpio: remove runtime width/endianness evaluation
---

8b29336fe01dab3541ebb283daddf9d0168c3f05