| commit | 1c5ff0f54dc7f821f3d88b2ddbe0ec623b3317c2 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 16 Dec 2011 19:13:49 +0000 (16 11:13 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 16 Dec 2011 19:13:49 +0000 (16 11:13 -0800) | ||
| tree | 0cc2720f7f52de4c6e29553368845400cdafbe8a | treesnapshot (tar.gz zip) |
| parent | 3f5fcf60e912a79721cbbd63704a03bbfb92eac2 | commitdiff |
| parent | 87b9b0e0d50db3282fb1eb702307ccfca8775744 | commitdiff |
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: Fix DA9052 GPIO build errors.
gpio: mpc8xxx: don't allow input-only pins to be output for MPC5121
gpio-ml-ioh: Add the irq_disable/irq_enable hooks for ml-ioh irq chip
gpio-ml-ioh: fix a bug in the interrupt handler
gpio: pl061: drop extra check for NULL platform_data
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6:
gpio: Fix DA9052 GPIO build errors.
gpio: mpc8xxx: don't allow input-only pins to be output for MPC5121
gpio-ml-ioh: Add the irq_disable/irq_enable hooks for ml-ioh irq chip
gpio-ml-ioh: fix a bug in the interrupt handler
gpio: pl061: drop extra check for NULL platform_data