From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Nov 2011 16:45:50 +0000 (-0200)
Subject: Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.2-rc2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=80f01ca1fce2d5045b98f01989017767339b8700

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
---

80f01ca1fce2d5045b98f01989017767339b8700