tree 3450a2e7c22777ca5ca4cb4944c4b2ed1f218805
parent 20d9d9a0544436b1b8c94689c01d746d6bd5525c
parent dba69d1092e291e257fb5673a3ad0e4c87878ebc
author Linus Torvalds <torvalds@linux-foundation.org> 1333559041 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1333559041 -0700

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

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, kvm: Call restore_sched_clock_state() only after %gs is initialized
  x86: Use -mno-avx when available
  x86: Remove the ancient and deprecated disable_hlt() and enable_hlt() facility
  x86: Preserve lazy irq disable semantics in fixup_irqs()