tree 75fc0709ecb1f02dc5b6dc6b9b7f5bfe69de98a2
parent 5bc6d799e1158b0a9d99fe1d92b397214fa76f91
parent da482474b8396e1a099c37ffc6541b78775aedb4
author Linus Torvalds <torvalds@linux-foundation.org> 1264589350 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264589350 -0800

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, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers.
  x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG)
  Revert "x86: ucode-amd: Load ucode-patches once ..."
  x86: Disable HPET MSI on ATI SB700/SB800
  x86: Set hotpluggable nodes in nodes_possible_map