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)
Conflicts:

drivers/pci/quirks.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge