| commit | 7203781c98ad9147564d327de6f6513ad8fc0f4e | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Thu Sep 04 08:08:42 2008 -0700 |
| committer | H. Peter Anvin <hpa@zytor.com> | Thu Sep 04 08:08:42 2008 -0700 |
| tree | 5c29a2a04a626bf08a0d56fd8a0068b3c92ad284 | |
| parent | 671eef85a3e885dff4ce210d8774ad50a91d5967 [diff] | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 [diff] |
Merge branch 'x86/cpu' into x86/core Conflicts: arch/x86/kernel/cpu/feature_names.c include/asm-x86/cpufeature.h