Merge branch 'linus' into x86/x2apic

2008-07-18 22:50:34 +02:00
parent 511d9d3418 5b664cb235
commit a208f37a46
3697 changed files with 244003 additions and 275846 deletions
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1411,7 +1411,6 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
 {
 	pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n", d->ident);
 	acpi_skip_timer_override = 1;
-	force_mask_ioapic_irq_2();
 	return 0;
 }