Merge branch 'omap-for-v3.11/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 12:21:14 +0000 (05:21 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 18 Jun 2013 12:21:14 +0000 (05:21 -0700)

Trivial merge