From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 May 2012 18:22:13 +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=60b66abf7ee6a8c497daf2010b987b20431941dd;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
---

60b66abf7ee6a8c497daf2010b987b20431941dd
Reading git-diff-tree failed