From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 14 Oct 2011 05:07:52 +0000 (+1200)
Subject: Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.1-rc10~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9308cfd5ab4ade3d81cf591c7599c3a05a21b04;p=karo-tx-linux.git

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: fix gpio_base
  gpio/omap: fix build error with certain OMAP1 configs
---

e9308cfd5ab4ade3d81cf591c7599c3a05a21b04