From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Oct 2011 22:46:42 +0000 (+0100)
Subject: Merge branch 'depends/rmk/gpio' into next/devel
X-Git-Tag: v3.2-rc1~92^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efa62e1355f0495f37f1296754b8880947c8da72;p=pandora-kernel.git

Merge branch 'depends/rmk/gpio' into next/devel

Conflicts:
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/plat-mxc/include/mach/gpio.h

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

efa62e1355f0495f37f1296754b8880947c8da72
Reading git-diff-tree failed