tree 4213c3fc8a1459894c49eae167744fa96be1e93e
parent f08c0761d6ff79e2f4c81f95fd01b761e0410785
parent b74548e76a0eab1f29546e7c5a589429c069a680
author Linus Torvalds <torvalds@linux-foundation.org> 1218498275 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218498275 -0700

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix 2.6.27rc1 cannot boot more than 8CPUs
  x86: make "apic" an early_param() on 32-bit, NULL check
  EFI, x86: fix function prototype
  x86, pci-calgary: fix function declaration
  x86: work around gcc 3.4.x bug
  x86: make "apic" an early_param() on 32-bit
  x86, debug: tone down arch/x86/kernel/mpparse.c debugging printk
  x86_64: restore the proper NR_IRQS define so larger systems work.
  x86: Restore proper vector locking during cpu hotplug
  x86: Fix broken VMI in 2.6.27-rc..
  x86: fdiv bug detection fix