Merge branch 'omap-for-v3.16/fixes'
authorTony Lindgren <tony@atomide.com>
Mon, 16 Jun 2014 13:05:26 +0000 (06:05 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 16 Jun 2014 13:05:26 +0000 (06:05 -0700)

Trivial merge