Merge commit 'b8c93646fd5c' into omap-for-v4.3/fixes
authorTony Lindgren <tony@atomide.com>
Thu, 24 Sep 2015 23:23:20 +0000 (16:23 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 24 Sep 2015 23:23:20 +0000 (16:23 -0700)

Trivial merge