From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Dec 2011 19:13:49 +0000 (-0800)
Subject: Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6
X-Git-Tag: v3.2-rc6~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1c5ff0f54dc7f821f3d88b2ddbe0ec623b3317c2;p=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: 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
---

1c5ff0f54dc7f821f3d88b2ddbe0ec623b3317c2