Merge branch 'omap-for-v3.15/fixes'
authorTony Lindgren <tony@atomide.com>
Sat, 19 Apr 2014 00:06:57 +0000 (17:06 -0700)
committerTony Lindgren <tony@atomide.com>
Sat, 19 Apr 2014 00:06:57 +0000 (17:06 -0700)

Trivial merge