Merge branch 'linus' into x86/apic
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:44:22 +0000 (09:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Feb 2009 08:44:22 +0000 (09:44 +0100)
Conflicts:
arch/x86/kernel/acpi/boot.c
arch/x86/mm/fault.c


Trivial merge