Merge branch 'omap-for-v4.2/legacy' into omap-for-v4.2/cleanup
authorTony Lindgren <tony@atomide.com>
Wed, 20 May 2015 21:51:05 +0000 (14:51 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 20 May 2015 21:51:05 +0000 (14:51 -0700)

Trivial merge