From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 May 2012 00:27:15 +0000 (-0700)
Subject: Merge tag 'omap-dt-for-v3.5' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93f63fcbf4f1b8d6fa9f1cf579cf129d3d96469a;p=pandora-kernel.git

Merge tag 'omap-dt-for-v3.5' into tmp-merge

Minor DT updates based on the dt-missed-3.4 branch

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

93f63fcbf4f1b8d6fa9f1cf579cf129d3d96469a
Reading git-diff-tree failed