Merge branch 'omap-for-v4.1/legacy' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 17 Mar 2015 18:27:40 +0000 (11:27 -0700)
committerTony Lindgren <tony@atomide.com>
Tue, 17 Mar 2015 18:27:40 +0000 (11:27 -0700)

Trivial merge