diff options
author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 17:08:42 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 17:08:42 +0200 |
commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /include/asm-x86/div64.h | |
parent | x86, e820: add support for AddressRangeUnusuable ACPI memory type (diff) | |
parent | x86: cpufeature: fix SMX flag (diff) | |
download | linux-7203781c98ad9147564d327de6f6513ad8fc0f4e.tar.xz linux-7203781c98ad9147564d327de6f6513ad8fc0f4e.zip |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/asm-x86/div64.h')
0 files changed, 0 insertions, 0 deletions