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

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

Conflicts:
	arch/arm/mach-omap2/pdata-quirks.c
---

8f9f81baf324c2225922aaa0dd65c88ee585d49b
Reading git-diff-tree failed