]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
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)
* fixes:
  ixp4xx: fix compilation by adding gpiolib support

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

1  2  3 
arch/arm/Kconfig

Simple merge