Merge branch 'omap-for-v3.15/tmp-merge'
authorTony Lindgren <tony@atomide.com>
Fri, 7 Mar 2014 17:29:36 +0000 (09:29 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 7 Mar 2014 17:29:36 +0000 (09:29 -0800)

Trivial merge