aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/nmi.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-21 10:37:17 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-21 10:37:17 -0400
commitacee709cab689ec7703770e8b8cb5cc3a4abcb31 (patch)
tree258729f7d7bc385e08d471ade34bd3ce1e8ea280 /arch/x86/kernel/nmi.c
parent33a37eb411d193851c334060780ab834ba534292 (diff)
parent5ff4789d045cdaec7629e027e4f8ff8e34308b81 (diff)
parent35b680557f95564f70f21a8d3f5c72e101fab260 (diff)
parentc4dc59ae7af8c1c116d2cb4dffba337f032a6bee (diff)
parent7edf8891ad7aef5f4e97991fed6fb0e605e96ea0 (diff)
parent9781f39fd209cd93ab98b669814191acc67f32fd (diff)
parent48fe4a76e27dc64b47f3d2a2af2b6bbf2b2f5b6b (diff)
parentbe54f9d1c8df93c4998e134a306652caaa58f67f (diff)
parent77e442461c74068217b59b356cf18992c78ed896 (diff)
parentcaadbdce240c43e3e46c82fce6c00eb7f01e1beb (diff)
parent5e5a29bf2624a5984e1c36c3a2481ee91249ec9c (diff)
parente3a61b0a8c0e342e700a61cd554b01050f333a36 (diff)
parentfec0962e0bed407927b9ff54bb0596a3ab7e4b61 (diff)
parentfab3b58d3b242b5903f78d60d86803a8aecdf6de (diff)
parentf2ba93929fdb91fd806be20e959a50f7db82790e (diff)
parent48ae74443403ab25876959e84785f61bf421ccef (diff)
parent3cabf37f6167125cb5185db05f5061650f685ab7 (diff)
parent7019cc2dd6fafcdc6b104005482dc910dcdbb797 (diff)
parent2ddf9b7b3e6660199269e34cfa27148440ddc3bf (diff)
parente66d90fb4abd0a27ee96f57a32fb561221c4d6ae (diff)
Merge branches 'x86/urgent', 'x86/amd-iommu', 'x86/apic', 'x86/cleanups', 'x86/core', 'x86/cpu', 'x86/fixmap', 'x86/gart', 'x86/kprobes', 'x86/memtest', 'x86/modules', 'x86/nmi', 'x86/pat', 'x86/reboot', 'x86/setup', 'x86/step', 'x86/unify-pci', 'x86/uv', 'x86/xen' and 'xen-64bit' into x86/for-linus