Merge branch 'omap-for-v3.11/dt-fixes' into omap-for-v3.11/fixes
authorTony Lindgren <tony@atomide.com>
Fri, 19 Jul 2013 10:28:35 +0000 (03:28 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 19 Jul 2013 10:28:35 +0000 (03:28 -0700)

Trivial merge