Merge branch 'omap-for-v4.1/fixes-not-urgent' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 26 Mar 2015 19:12:36 +0000 (12:12 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 26 Mar 2015 19:12:36 +0000 (12:12 -0700)

Trivial merge