diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:00:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:00:45 -0400 |
| commit | 59c37bf8924c30fbac7ebb66a1d92dcb9f05f6b1 (patch) | |
| tree | 2ffc3f2ce655806424d022f3a4daec7665ab888f /include/asm-x86/olpc.h | |
| 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>
Diffstat (limited to 'include/asm-x86/olpc.h')
0 files changed, 0 insertions, 0 deletions