Merge branch 'omap-for-v4.4/fixes' into for-next
authorTony Lindgren <tony@atomide.com>
Mon, 12 Oct 2015 23:35:21 +0000 (16:35 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 12 Oct 2015 23:35:21 +0000 (16:35 -0700)

Trivial merge