From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 13 Mar 2009 21:44:51 +0000 (+0000)
Subject: Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
X-Git-Tag: v2.6.30-rc1~636^2~29
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97fb44eb6bc01f4ffed4300e475aa15e44877375;p=pandora-kernel.git

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:

	arch/arm/mach-at91/gpio.c
---

97fb44eb6bc01f4ffed4300e475aa15e44877375
Reading git-diff-tree failed