From: Tony Lindgren <tony@atomide.com>
Date: Thu, 23 Feb 2012 20:07:13 +0000 (-0800)
Subject: Merge branch 'cleanup' into testing-misc
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f96f206618c2e298ab652987d3da70c51ca6046a;p=pandora-kernel.git

Merge branch 'cleanup' into testing-misc

Conflicts:
	arch/arm/mach-omap1/gpio16xx.c
	drivers/gpio/gpio-omap.c
---

f96f206618c2e298ab652987d3da70c51ca6046a
Reading git-diff-tree failed