Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:45:50 +0000 (14:45 -0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Nov 2011 16:45:50 +0000 (14:45 -0200)
commit80f01ca1fce2d5045b98f01989017767339b8700
tree8899dbaa2949b8f2c6e83b65cd35669d9e85a462
parentfc21a2dd371806aed818e2ec0dfcb55dc7448a98
parenta59024f1ecb52972b9be5ee91b5ef38a6b263d1b
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: pca953x: propagate the errno from the chip_init functions
  gpio: pca953x: remove unneeded check for chip type
  gpio/omap: check return value from irq_alloc_generic_chip
  gpio/omap: replace MOD_REG_BIT macro with static inline
drivers/gpio/gpio-omap.c
drivers/gpio/gpio-pca953x.c