From: Olof Johansson <olof@lixom.net>
Date: Wed, 30 May 2012 23:16:12 +0000 (-0700)
Subject: Merge branches 'fixes' and 'fixes2' into devel-late
X-Git-Tag: v3.5-rc1~33^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=47e1993d32d4e0f9524c2147576468fe11e87b5f;p=linux-2.6-block.git

Merge branches 'fixes' and 'fixes2' into devel-late

* fixes:
  ixp4xx: fix compilation by adding gpiolib support

* fixes2:
  ARM: LPC32xx: Adjust dts files to gpio dt binding
---

47e1993d32d4e0f9524c2147576468fe11e87b5f