diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 10:11:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-01 10:11:21 -0700 |
| commit | b9b16a792241e304834f43e2a5f02e6e43576f09 (patch) | |
| tree | f90a0e2266b73a2197a31d4b129a08f3f55e7b06 /arch/cris/include/asm/cputime.h | |
| parent | 4b2ce8f15f8fdcd8a73dd31664b252e2b4ed174a (diff) | |
| parent | da4aaa7d860c63a1bfd3c73cf8309afe2840c5b9 (diff) | |
Merge branch 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpufeature update from Ingo Molnar:
"Two refinements to clflushopt support"
* 'x86-cpufeature-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, cpufeature: If we disable CLFLUSH, we should disable CLFLUSHOPT
x86, cpufeature: Rename X86_FEATURE_CLFLSH to X86_FEATURE_CLFLUSH
Diffstat (limited to 'arch/cris/include/asm/cputime.h')
0 files changed, 0 insertions, 0 deletions