Merge branches 'fixes' and 'fixes2' into devel-late
authorOlof Johansson <olof@lixom.net>
Wed, 30 May 2012 23:16:12 +0000 (16:16 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 30 May 2012 23:16:12 +0000 (16:16 -0700)
commit47e1993d32d4e0f9524c2147576468fe11e87b5f
tree9957257116c0086e891db39bfa246f3b8f3d7a0f
parent63bda79dc484c015f9902f2c8ae019952b93f876
parent9dde0ae3769875ec1370cb316e50c54b57d52c1a
parenta035254aefe5a6c0b45c8c55588ab47403c674ed
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
arch/arm/Kconfig