diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 14:00:45 +0200 |
| commit | 40c7df75dea6e8260b40c41f576a0895be73f012 (patch) | |
| tree | 3dea25b65697061a79562fb9ea8c229a6a475ce5 /crypto/algapi.c | |
| parent | b7a047f3bc596ac41a53b27b38eb7a7a5eb2d2b3 (diff) | |
| parent | 6064930f3b4c887fec5f6f0a3c3b188d49b92058 (diff) | |
| download | linux-crypto-40c7df75dea6e8260b40c41f576a0895be73f012.tar.gz linux-crypto-40c7df75dea6e8260b40c41f576a0895be73f012.zip | |
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>
Diffstat (limited to 'crypto/algapi.c')
0 files changed, 0 insertions, 0 deletions