Merge branch 'omap-for-v4.3/soc' into for-next
authorTony Lindgren <tony@atomide.com>
Fri, 17 Jul 2015 05:52:00 +0000 (22:52 -0700)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Jul 2015 05:52:00 +0000 (22:52 -0700)

Trivial merge