Merge branch 'omap-for-v3.15/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Thu, 13 Mar 2014 21:10:51 +0000 (14:10 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 13 Mar 2014 21:10:51 +0000 (14:10 -0700)

Trivial merge