tree f9ba6e6cb960fddb09da7c322d4b1dcb3f4b0e6f
parent 128283a47e7cc6754db3d2704004c1ed728d26db
parent 1c2a48cf65580a276552151eb8f78d78c55b828e
author Linus Torvalds <torvalds@linux-foundation.org> 1294440931 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294440931 -0800

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

* 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: apic: Cleanup and simplify setup_local_APIC()
  x86: Further simplify mp_irq info handling
  x86: Unify 3 similar ways of saving mp_irqs info
  x86, ioapic: Avoid writing io_apic id if already correct
  x86, x2apic: Don't map lapic addr for preenabled x2apic systems
  x86, sfi: Use register_lapic_address()
  x86, apic: Use register_lapic_address() in init_apic_mapping()
  x86, apic: Remove early_init_lapic_mapping()
  x86, apic: Unify identical register_lapic_address() functions