diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 20:23:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 20:23:20 +0200 |
| commit | 9cf889c517ae176ff243ce2922df1b023b7559ce (patch) | |
| tree | 3dea25b65697061a79562fb9ea8c229a6a475ce5 | |
| parent | 536663af761631427863c2290e900d08683de75c (diff) | |
| parent | 40c7df75dea6e8260b40c41f576a0895be73f012 (diff) | |
| download | linux-crypto-9cf889c517ae176ff243ce2922df1b023b7559ce.tar.gz linux-crypto-9cf889c517ae176ff243ce2922df1b023b7559ce.zip | |
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
0 files changed, 0 insertions, 0 deletions