From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 20:04:45 +0000 (-0800)
Subject: Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Tag: v3.14-rc1~164
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5d4863e4cc4dc12d1d5e42da3cb5d38c535e4ad6;p=linux.git

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

Pull x86 TLB detection update from Ingo Molnar:
 "A single change that extends our TLB cache size detection+reporting
  code"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpu: Detect more TLB configuration
---

5d4863e4cc4dc12d1d5e42da3cb5d38c535e4ad6