From: Linus Torvalds Date: Fri, 6 Jun 2014 17:24:07 +0000 (-0700) Subject: Fix ARM merge mistake in mvebu board file X-Git-Tag: omap-for-v3.16/fixes-against-rc1~91^2~11 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e47aaef0bd3a50a43626fa6b19e1f964ac173d6;p=pandora-kernel.git Fix ARM merge mistake in mvebu board file Russell King points out that my ARM merge (commit eb3d3ec567e8) was broken wrt the arch/arm/mach-mvebu/board-v7.c file, leaving in a stale l2x0_of_init() call (it's now handled by the DT description). Which is kind of embarrassing, since I knew about it as it wasn't the only file that had similar merge issues. At least I got the other ones right. Reported-by: Russell King Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed