Merge branch 'hotplug' into devel

Conflicts:
	arch/arm/kernel/head-common.S
This commit is contained in:
Russell King 2010-10-18 22:34:47 +01:00
commit a0a55682b8
29 changed files with 403 additions and 300 deletions