From: Tony Lindgren <tony@atomide.com>
Date: Mon, 19 Jan 2015 21:23:28 +0000 (-0800)
Subject: Merge branch 'omap-for-v3.20/cleanup' into for-next
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1e69b042169d8e989a4acaa93a3777d033639a6;p=pandora-kernel.git

Merge branch 'omap-for-v3.20/cleanup' into for-next

Conflicts:
	arch/arm/mach-omap2/twl-common.c
---

d1e69b042169d8e989a4acaa93a3777d033639a6
Reading git-diff-tree failed