Merge commit 'c0053bd50af5' into omap-for-v4.8/soc
authorTony Lindgren <tony@atomide.com>
Thu, 23 Jun 2016 05:55:18 +0000 (22:55 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 23 Jun 2016 05:55:18 +0000 (22:55 -0700)

Trivial merge