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

Merge branch 'cleanup' into testing-misc

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

aa5a24c3ad66985f3f70e1d7cf709e53ce805f3f
Reading git-diff-tree failed