Merge branch 'omap-for-v4.3/soc' into for-next
authorTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2015 10:59:02 +0000 (03:59 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 12 Aug 2015 10:59:02 +0000 (03:59 -0700)

Trivial merge