tree 5cffca570e164bcd190b5044f6eb0f7c8180f262
parent f5325225658737e6c9cb8e24373e2c281a90be2a
parent 23952a96ae738277f3139b63d622e22984589031
author Linus Torvalds <torvalds@linux-foundation.org> 1220754983 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1220754983 -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: cpu_init(): fix memory leak when using CPU hotplug
  x86: pda_init(): fix memory leak when using CPU hotplug
  x86, xen: Use native_pte_flags instead of native_pte_val for .pte_flags
  x86: move mtrr cpu cap setting early in early_init_xxxx
  x86: delay early cpu initialization until cpuid is done
  x86: use X86_FEATURE_NOPL in alternatives
  x86: add NOPL as a synthetic CPU feature bit
  x86: boot: stub out unimplemented CPU feature words