From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 25 Mar 2012 22:56:30 +0000 (+0100)
Subject: Merge branch 'sa11x0-mcp' into sa11x0
X-Git-Tag: v3.4-rc1~83^2^3~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7256ecc2b7b91b4212ccc5511cb12254bdf806d0;p=pandora-kernel.git

Merge branch 'sa11x0-mcp' into sa11x0

Conflicts:
	arch/arm/mach-sa1100/assabet.c
	arch/arm/mach-sa1100/collie.c
	arch/arm/mach-sa1100/generic.c
	arch/arm/mach-sa1100/lart.c
	arch/arm/mach-sa1100/shannon.c
---

7256ecc2b7b91b4212ccc5511cb12254bdf806d0
Reading git-diff-tree failed