| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 21 Oct 2010 20:18:36 +0000 (13:18 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 21 Oct 2010 20:18:36 +0000 (13:18 -0700) | ||
| commit | bf70030dc0b031f000c74721f2e9c88686b7da6d | |
| tree | e5cd09cb2d7b33647c8fa0b9288bbaf81c0e6d80 | tree | snapshot (tar.xz tar.gz zip) |
| parent | d60a2793ba562c6ea9bbf62112da3e6342adcf83 | commit | diff |
| parent | 366d4a43b1a7a861c356a0e407c4f03f454d42ea | commit | diff |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cpu: Fix X86_FEATURE_NOPL
x86, cpu: Re-run get_cpu_cap() after adjusting the CPUID level
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, cpu: Fix X86_FEATURE_NOPL
x86, cpu: Re-run get_cpu_cap() after adjusting the CPUID level
| arch/x86/kernel/cpu/common.c | diff1 | | diff2 | | blob | history |
| arch/x86/kernel/cpu/cpu.h | diff1 | | diff2 | | blob | history |