Merge branch 'omap-for-v4.8/soc' into omap-for-v4.8/fixes
authorTony Lindgren <tony@atomide.com>
Mon, 15 Aug 2016 15:29:44 +0000 (08:29 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 15 Aug 2016 15:29:44 +0000 (08:29 -0700)

Trivial merge