Merge branch 'x86/urgent' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 23:41:02 +0000 (00:41 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 9 Feb 2009 23:41:02 +0000 (00:41 +0100)
Conflicts:
arch/x86/kernel/acpi/boot.c


Trivial merge