Merge branch 'omap-for-v3.14/fixes'
authorTony Lindgren <tony@atomide.com>
Fri, 14 Feb 2014 00:38:38 +0000 (16:38 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 14 Feb 2014 00:38:38 +0000 (16:38 -0800)

Trivial merge