diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 00:59:14 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-02-25 01:01:17 +0100 |
| commit | 2aaa822984b97efd894d10d1e1382206ef0291a7 (patch) | |
| tree | 1065b2363853588b2f826117634caf5a8e044e23 /arch/x86/kernel/i8259.c | |
| parent | x86, mce, cmci: recheck CMCI banks after APIC has been enabled on CPU #0 (diff) | |
| parent | x86, mce: enable machine checks in 32-bit defconfig (diff) | |
| download | linux-2aaa822984b97efd894d10d1e1382206ef0291a7.tar.xz linux-2aaa822984b97efd894d10d1e1382206ef0291a7.zip | |
Merge branch 'x86/defconfig' into x86/mce2
Conflicts (resolved):
arch/x86/configs/x86_64_defconfig
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/i8259.c')
0 files changed, 0 insertions, 0 deletions