Merge branch 'omap-for-v4.2/fixes-v2' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2015 08:50:52 +0000 (01:50 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2015 08:50:52 +0000 (01:50 -0700)

Trivial merge