diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-30 16:16:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-30 16:16:12 -0700 |
| commit | 47e1993d32d4e0f9524c2147576468fe11e87b5f (patch) | |
| tree | 9957257116c0086e891db39bfa246f3b8f3d7a0f /arch/arm/mach-ixp4xx | |
| parent | 63bda79dc484c015f9902f2c8ae019952b93f876 (diff) | |
| parent | 9dde0ae3769875ec1370cb316e50c54b57d52c1a (diff) | |
| parent | a035254aefe5a6c0b45c8c55588ab47403c674ed (diff) | |
| download | linux-47e1993d32d4e0f9524c2147576468fe11e87b5f.tar.gz linux-47e1993d32d4e0f9524c2147576468fe11e87b5f.tar.bz2 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