diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 09:21:21 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 09:21:21 -0700 |
| commit | aa3341a168883654d1b13f5931c5ed2762537831 (patch) | |
| tree | 1394eb320916b4e5604761dbc8ae1a9bc1903602 /lib | |
| parent | 42390cdec5f6e6e2ee54f308474a6ef7dd16aa5c (diff) | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 (diff) | |
Merge branch 'x86/cpu' into x86/x2apic
Conflicts:
arch/x86/kernel/cpu/feature_names.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions