]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc21a2d a59024f)
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)
* '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

1  2 
drivers/gpio/gpio-omap.c patch | diff1 | diff2 | blob | history
drivers/gpio/gpio-pca953x.c patch | diff1 | diff2 | blob | history

diff --cc drivers/gpio/gpio-omap.c
Simple merge
diff --cc drivers/gpio/gpio-pca953x.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.