From: Olof Johansson Date: Fri, 19 Oct 2012 23:17:51 +0000 (-0700) Subject: Merge tag 'kirkwood_fixes_for_v3.7' of git://git.infradead.org/users/jcooper/linux... X-Git-Tag: upstream/snapshot3+hdmi~6319^2~14 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70f3900ee5c78d498dbbf880ec409f4b8f4da21e;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 --- 70f3900ee5c78d498dbbf880ec409f4b8f4da21e