| commit | fe47784ba5cbb6b713c013e046859946789b45e4 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@zytor.com> | Thu Sep 04 09:04:45 2008 -0700 |
| committer | H. Peter Anvin <hpa@zytor.com> | Thu Sep 04 09:04:45 2008 -0700 |
| tree | 6384958d55e29be0d2eb8ae78fa437c10636d8d6 | |
| parent | 83b8e28b14d63db928cb39e5c5ed2a548246bd71 [diff] | |
| parent | af2e1f276ff08f17192411ea3b71c13a758dfe12 [diff] |
Merge branch 'x86/cpu' into x86/xsave Conflicts: arch/x86/kernel/cpu/feature_names.c include/asm-x86/cpufeature.h