commit df8edfa9af5b2160549ed1a79b72e3ed13b6c7e2
author Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 30 08:34:38 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 30 08:34:38 2013 -0700
tree c61b836ee22594de97cca58f018585dbe05f61a1
parent 874f6d1be7699b5d1873283b4737712cbabd7754
parent 1077c932db63ecc571c31df1c24d4a44e30928e5

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

Pull x86 cpuid changes from Ingo Molnar:
 "The biggest change is x86 CPU bug handling refactoring and cleanups,
  by Borislav Petkov"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, CPU, AMD: Drop useless label
  x86, AMD: Correct {rd,wr}msr_amd_safe warnings
  x86: Fold-in trivial check_config function
  x86, cpu: Convert AMD Erratum 400
  x86, cpu: Convert AMD Erratum 383
  x86, cpu: Convert Cyrix coma bug detection
  x86, cpu: Convert FDIV bug detection
  x86, cpu: Convert F00F bug detection
  x86, cpu: Expand cpufeature facility to include cpu bugs