From: Tony Lindgren <tony@atomide.com>
Date: Wed, 12 Mar 2014 17:55:32 +0000 (-0700)
Subject: Merge branch 'omap-for-v3.15/dt-overo' into omap-for-v3.15/tmp-merge
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=090992dd43b6867e29ef34f93b08378a378dcbb3;p=pandora-kernel.git

Merge branch 'omap-for-v3.15/dt-overo' into omap-for-v3.15/tmp-merge

Conflicts:
	arch/arm/boot/dts/omap3-overo.dtsi
---

090992dd43b6867e29ef34f93b08378a378dcbb3
Reading git-diff-tree failed