From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 16 Sep 2011 20:45:16 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable
X-Git-Tag: v3.2-rc1~130^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4722cd7741c6404f967f7a7b8b666540b6c1663e;p=pandora-kernel.git

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
---

4722cd7741c6404f967f7a7b8b666540b6c1663e
Reading git-diff-tree failed