Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 17:31:12 +0000 (19:31 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 17:31:12 +0000 (19:31 +0200)
commit3e370b29d35fb01bfb92c2814d6f79bf6a2cb970
tree3b8fb467d60bfe6a34686f4abdc3a60050ba40a4
parent88d1dce3a74367291f65a757fbdcaf17f042f30c
parent5b664cb235e97afbf34db9c4d77f08ebd725335e
Merge branch 'linus' into x86/pci-ioapic-boot-irq-quirks

Conflicts:

drivers/pci/quirks.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Documentation/kernel-parameters.txt
arch/x86/pci/common.c
drivers/acpi/pci_irq.c
drivers/pci/quirks.c
include/linux/pci.h
include/linux/pci_ids.h