| commit | 59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Sep 10 14:00:45 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Sep 10 14:00:45 2008 +0200 |
| tree | 2ffc3f2ce655806424d022f3a4daec7665ab888f | |
| parent | ec70cae8698632917f06110fdb70c6364281ecc6 [diff] | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 [diff] |
Merge commit 'v2.6.27-rc6' into x86/unify-cpu-detect Conflicts: arch/x86/kernel/cpu/amd.c arch/x86/kernel/cpu/common.c arch/x86/kernel/cpu/common_64.c arch/x86/kernel/cpu/feature_names.c include/asm-x86/cpufeature.h Signed-off-by: Ingo Molnar <mingo@elte.hu>