diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-31 01:16:12 +0200 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-31 01:16:12 +0200 |
commit | 47e1993d32d4e0f9524c2147576468fe11e87b5f (patch) | |
tree | 9957257116c0086e891db39bfa246f3b8f3d7a0f /arch/arm/mach-ixp4xx | |
parent | Merge branch 'late/board' into devel-late (diff) | |
parent | ixp4xx: fix compilation by adding gpiolib support (diff) | |
parent | ARM: LPC32xx: Adjust dts files to gpio dt binding (diff) | |
download | linux-47e1993d32d4e0f9524c2147576468fe11e87b5f.tar.xz linux-47e1993d32d4e0f9524c2147576468fe11e87b5f.zip |
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