Merge branch 'omap-for-v3.20/cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2015 01:02:33 +0000 (17:02 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 8 Jan 2015 01:02:33 +0000 (17:02 -0800)

Trivial merge