Merge branch 'omap-for-v3.20/cleanup' into for-next
authorTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 21:23:28 +0000 (13:23 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 19 Jan 2015 21:23:28 +0000 (13:23 -0800)
Conflicts:
arch/arm/mach-omap2/twl-common.c


Trivial merge