Merge branch 'omap-for-v4.0/fixes' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 18 Mar 2015 21:06:58 +0000 (14:06 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 18 Mar 2015 21:06:58 +0000 (14:06 -0700)

Trivial merge