projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 068a565 1243163)
Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux...
authorOlof Johansson <olof@lixom.net>
Fri, 19 Oct 2012 23:17:51 +0000 (16:17 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 19 Oct 2012 23:17:51 +0000 (16:17 -0700)
commit70f3900ee5c78d498dbbf880ec409f4b8f4da21e
tree43a49fe2daee9eb79fc557e3c96ded8320f9d544tree | snapshot
parent068a565afad3ae818cc0d5495479c4abccc7762ccommit | diff
parent12431634947f4c34015561104c4f8a305bfe6b48commit | 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
Domain: System / Kernel;