]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit906470748931ea01f6f14c8be7443dda24e89897
tree43a49fe2daee9eb79fc557e3c96ded8320f9d544
parenta2a6053175d02328e99e8db69728d5558ccf56ee
parent111e783378b87a9e122142fa1e8ef11bcb2847c8
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