From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 8 Apr 2010 09:47:05 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6
X-Git-Tag: v2.6.34-rc4~2^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb3c9d4f851d51bb6302ef0df830dcec88d7c529;p=pandora-kernel.git

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

Conflicts:
	arch/arm/mach-mx3/mach-pcm037.c
---

bb3c9d4f851d51bb6302ef0df830dcec88d7c529
Reading git-diff-tree failed