From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Thu, 11 Jun 2009 14:35:00 +0000 (+0100)
Subject: Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
X-Git-Tag: v2.6.31-rc1~344^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42578c82e0f1810a07ebe29cb05e874893243d8c;p=pandora-kernel.git

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

Conflicts:
	arch/arm/Kconfig
	arch/arm/kernel/smp.c
	arch/arm/mach-realview/Makefile
	arch/arm/mach-realview/platsmp.c
---

42578c82e0f1810a07ebe29cb05e874893243d8c
Reading git-diff-tree failed