diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 15:08:42 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 15:08:42 (GMT) |
| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e (patch) | |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 /arch/x86/kernel/irq_64.c | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
| download | linux-7203781c98ad9147564d327de6f6513ad8fc0f4e.tar.xz | |
Merge branch 'x86/cpu' into x86/core
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'arch/x86/kernel/irq_64.c')
0 files changed, 0 insertions, 0 deletions