Merge branch 'x86/urgent' into x86/core

Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
This commit is contained in:
Ingo Molnar 2009-02-26 06:30:42 +01:00
commit 13b2eda64d
5 changed files with 67 additions and 12 deletions