diff options
author | 2009-02-24 15:59:14 -0800 | |
---|---|---|
committer | 2009-02-24 16:01:17 -0800 | |
commit | 2aaa822984b97efd894d10d1e1382206ef0291a7 (patch) | |
tree | 1065b2363853588b2f826117634caf5a8e044e23 /include/linux/interrupt.h | |
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 | wireguard-linux-2aaa822984b97efd894d10d1e1382206ef0291a7.tar.xz wireguard-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 'include/linux/interrupt.h')
0 files changed, 0 insertions, 0 deletions