From: Tony Lindgren <tony@atomide.com>
Date: Fri, 9 Nov 2012 23:29:44 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.8/board-v2' into omap-for-v3.8/tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6866811d42e16cb1a85c2ffe51a80b64402d505;p=pandora-kernel.git

Merge branch 'omap-for-v3.8/board-v2' into omap-for-v3.8/tmp-merge

Conflicts:
	arch/arm/mach-omap2/board-omap4panda.c
---

c6866811d42e16cb1a85c2ffe51a80b64402d505
Reading git-diff-tree failed