From: Olof Johansson Date: Mon, 1 Oct 2012 21:34:39 +0000 (-0700) Subject: Merge branch 'next/boards' into HEAD X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~56^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5;p=pandora-kernel.git Merge branch 'next/boards' into HEAD Conflicts: arch/arm/mach-shmobile/board-armadillo800eva.c --- a8e1ceb728d249fbe0bc5e30b9b8ceb0f33b54f5 Reading git-diff-tree failed