Merge branch 'omap-for-v4.3/fixes' into for-next
authorTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2015 19:36:30 +0000 (12:36 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 16 Oct 2015 19:36:30 +0000 (12:36 -0700)

Trivial merge