diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-23 01:20:34 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-23 01:20:34 +0100 |
| commit | d02e30c31c57683a66ed68a1bcff900ca78f6d56 (patch) | |
| tree | c3ce99a00061bcc1199b50fa838147d876c56717 /arch/x86/kernel/apic/nmi.c | |
| parent | x86: Convert nmi_lock to raw_spinlock (diff) | |
| parent | Merge branch 'x86/urgent' into x86/irq (diff) | |
| download | linux-d02e30c31c57683a66ed68a1bcff900ca78f6d56.tar.xz linux-d02e30c31c57683a66ed68a1bcff900ca78f6d56.zip | |
Merge branch 'x86/irq' into x86/apic
Merge reason:
Conflicts in arch/x86/kernel/apic/io_apic.c
Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/apic/nmi.c')
0 files changed, 0 insertions, 0 deletions