diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 09:11:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-04 09:11:16 -0700 |
commit | 1f9c52e16b5f67131440ddd51bd0cff27e45ea10 (patch) | |
tree | d15f176fb64b37af81b2390a6bf835f1f5999725 /kernel/time/Kconfig | |
parent | 9cb87aaf404110822200ca1e508471f8f083d1de (diff) | |
parent | 237d1548543312fcc8c99d302ab68fbf8ef6f97f (diff) |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu feature fixes from Ingo Molnar:
"Two small cpufeature support updates"
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Fix override new_cpu_data.x86 with 486
x86, cpufeature: Use new CC_HAVE_ASM_GOTO
Diffstat (limited to 'kernel/time/Kconfig')
0 files changed, 0 insertions, 0 deletions