diff options
author | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 01:11:51 +0100 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 01:11:51 +0100 |
commit | 638bee71c83a2837b48062fdc5b222163cf53d79 (patch) | |
tree | 9c1699c07a5aa547d769138317279b8ee1ba89e8 /arch/x86/kernel/alternative.c | |
parent | Merge branch 'x86/defconfig' into x86/mce2 (diff) | |
parent | Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', '... (diff) | |
download | linux-638bee71c83a2837b48062fdc5b222163cf53d79.tar.xz linux-638bee71c83a2837b48062fdc5b222163cf53d79.zip |
Merge branch 'x86/core' into x86/mce2
Diffstat (limited to 'arch/x86/kernel/alternative.c')
0 files changed, 0 insertions, 0 deletions