diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 22:25:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 22:25:23 +0100 |
commit | f5e4e20faa1eee3feaa0394897bbd1aca544e809 (patch) | |
tree | 047a93ff025c46ed97d3192a79f55b38fa071ca1 /Documentation/nfc | |
parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
parent | GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion (diff) | |
download | linux-f5e4e20faa1eee3feaa0394897bbd1aca544e809.tar.xz linux-f5e4e20faa1eee3feaa0394897bbd1aca544e809.zip |
Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6
2nd round of GPIO changes for v3.3 merge window
* tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6:
GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion
gpio: pl061: remove combined interrupt
gpio: pl061: convert to use generic irq chip
GPIO: add bindings for managed devices
ARM: realview: convert pl061 no irq to 0 instead of -1
gpio: pl061: convert to use 0 for no irq
gpio: pl061: use chained_irq_* functions in irq handler
GPIO/pl061: Add suspend resume capability
drivers/gpio/gpio-tegra.c: use devm_request_and_ioremap
Diffstat (limited to 'Documentation/nfc')
0 files changed, 0 insertions, 0 deletions