Merge branch 'omap-for-v4.3/legacy-v2' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 21 Jul 2015 11:32:38 +0000 (04:32 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 21 Jul 2015 11:32:38 +0000 (04:32 -0700)

Trivial merge