| commit | 70f3900ee5c78d498dbbf880ec409f4b8f4da21e | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Fri Oct 19 16:17:51 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Fri Oct 19 16:17:51 2012 -0700 |
| tree | 43a49fe2daee9eb79fc557e3c96ded8320f9d544 | |
| parent | 068a565afad3ae818cc0d5495479c4abccc7762c [diff] | |
| parent | 12431634947f4c34015561104c4f8a305bfe6b48 [diff] |
Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux into fixes From Jason Cooper: - improve #ifdef logic to prevent linker errors with CACHE_FEROCEON_L2 - lsxl board dts fixes * tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux: ARM: kirkwood: fix buttons on lsxl boards ARM: kirkwood: fix LEDs names for lsxl boards ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2