From: Tony Lindgren Date: Thu, 10 May 2012 16:39:05 +0000 (-0700) Subject: Merge branch 'cleanup-soc' into cleanup X-Git-Tag: v3.5-rc1~72^2~5^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=640ec79d6d8c10ceb254c269a1f7fd9cb47ea655;p=pandora-kernel.git Merge branch 'cleanup-soc' into cleanup Conflicts: arch/arm/mach-omap2/Makefile --- 640ec79d6d8c10ceb254c269a1f7fd9cb47ea655 Reading git-diff-tree failed