tree 77e50c9aef5caad4da86d0360d59bc84a7e4d759
parent 640c0f5c57864cbc1f495509bdc879fab94d4d9d
parent 5b2bdbc84556774afbe11bcfd24c2f6411cfa92b
author Linus Torvalds <torvalds@linux-foundation.org> 1425241364 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1425241364 -0800

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

Pull x86 fixes from Ingo Molnar:
 "A CR4-shadow 32-bit init fix, plus two typo fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Init per-cpu shadow copy of CR4 on 32-bit CPUs too
  x86/platform/intel-mid: Fix trivial printk message typo in intel_mid_arch_setup()
  x86/cpu/intel: Fix trivial typo in intel_tlb_table[]