From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 18 Oct 2010 21:34:47 +0000 (+0100)
Subject: Merge branch 'hotplug' into devel
X-Git-Tag: v2.6.37-rc1~184^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0a55682b83fd5f012afadcf415b030d7424ae68;p=pandora-kernel.git

Merge branch 'hotplug' into devel

Conflicts:
	arch/arm/kernel/head-common.S
---

a0a55682b83fd5f012afadcf415b030d7424ae68
Reading git-diff-tree failed