tree 7a55a18a4d10d1f8565be7399381f543362cbb32
parent edb34a4dbdfec6fd83fe907dbf4498eedc77e17e
parent 141d55e6cc590293ea1378f55b9ebd38f5024bf0
author Linus Torvalds <torvalds@linux-foundation.org> 1319643033 +0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1319643033 +0200

Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/irq: Standardize on CONFIG_SPARSE_IRQ=y
  x86, ioapic: Clean up ioapic/apic_id usage
  x86, ioapic: Factor out print_IO_APIC() to only print one io apic
  x86, ioapic: Print out irte with right ioapic index
  x86, ioapic: Split up setup_ioapic_entry()
  x86, ioapic: Pass struct irq_attr * to setup_ioapic_irq()
  apic, i386/bigsmp: Fix false warnings regarding logical APIC ID mismatches