tree 335764408d67ef041f967ed721fbe2dfaff7aff0
parent 5f16a8cf2da76f75e127a370e4dcfe223107922f
parent f037e416afb38b9ee8ac598d68733fcbaf665384
author Linus Torvalds <torvalds@linux-foundation.org> 1372807430 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1372807430 -0700

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

Pull x86 cleanups from Ingo Molnar:
 "Misc x86 cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, reloc: Use xorl instead of xorq in relocate_kernel_64.S
  x86, cleanups: Remove extra tab in __flush_tlb_one()
  x86/mce: Remove check for CONFIG_X86_MCE_P4THERMAL