Merge tag 'omap-dt-for-v3.5' into tmp-merge
authorTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 18:22:13 +0000 (11:22 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 May 2012 18:22:13 +0000 (11:22 -0700)
Minor DT updates based on the dt-missed-3.4 branch

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


Trivial merge