From: Tony Lindgren <tony@atomide.com>
Date: Fri, 28 Feb 2014 23:27:31 +0000 (-0800)
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=6e3a8269a77f836bfb0c719d0d0c5efc1096e15c;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
---

6e3a8269a77f836bfb0c719d0d0c5efc1096e15c
Reading git-diff-tree failed