Merge branch 'omap-for-v3.17/fixes'
authorTony Lindgren <tony@atomide.com>
Fri, 22 Aug 2014 23:55:58 +0000 (16:55 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 22 Aug 2014 23:55:58 +0000 (16:55 -0700)

Trivial merge