From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 6 Jan 2011 22:31:35 +0000 (+0000)
Subject: Merge branch 'smp' into misc
X-Git-Tag: v2.6.38-rc1~471^2~2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ec3eb13634529c0bc7466658d84d0bbe3244aea;p=pandora-kernel.git

Merge branch 'smp' into misc

Conflicts:
	arch/arm/kernel/entry-armv.S
	arch/arm/mm/ioremap.c
---

4ec3eb13634529c0bc7466658d84d0bbe3244aea
Reading git-diff-tree failed