]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:04:45 +0000 (12:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:04:45 +0000 (12:04 -0800)
commit5d4863e4cc4dc12d1d5e42da3cb5d38c535e4ad6
tree77625396ef3e1399a32a2c119388024829bb3b32
parent2a0fede97fd52a5c9789d1d54ebd3b46878151c3
parentdd360393f4d948eb518372316e52101cf3b44212
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
arch/x86/include/asm/processor.h
arch/x86/kernel/cpu/intel.c