From: Tony Lindgren Date: Mon, 5 Jul 2010 14:05:27 +0000 (+0300) Subject: Merge omap-testing X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7362c98e7939486e6f8744b474776a5aaf4f417f;p=pandora-kernel.git Merge omap-testing Conflicts: arch/arm/mach-omap2/board-n8x0.c --- 7362c98e7939486e6f8744b474776a5aaf4f417f Reading git-diff-tree failed