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

Merge branch 'sa1111' into sa11x0

Conflicts:
	arch/arm/common/sa1111.c
	arch/arm/mach-sa1100/neponset.c

Fixed:
	arch/arm/mach-sa1100/assabet.c
for the neponset changes
---

374da9da22ebaad0524c77905b5e89ae4619bef3
Reading git-diff-tree failed