From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Thu, 7 Jul 2011 08:00:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features
X-Git-Tag: v3.1-rc1~149^2~1^3~27
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e59a7943f2f72a1dc218447f4f285c8b67b3a98e;p=pandora-kernel.git

Merge remote-tracking branch 'grant/gpio/next-mx' into devel-features

Conflicts:
	arch/arm/mach-imx/mach-mx31_3ds.c
	arch/arm/mach-imx/mach-scb9328.c

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---

e59a7943f2f72a1dc218447f4f285c8b67b3a98e
Reading git-diff-tree failed