Merge branch 'omap-for-v4.0/fixes' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 17 Mar 2015 18:25:33 +0000 (11:25 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 17 Mar 2015 18:25:33 +0000 (11:25 -0700)

Trivial merge