Merge branch 'omap-for-v4.0/fixes' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 20:01:31 +0000 (13:01 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 1 Apr 2015 20:01:31 +0000 (13:01 -0700)

Trivial merge