diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-10-16 14:42:20 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-10-16 14:42:25 +0200 |
commit | 6b50f5c7c7163d50af0946a93b61c05e448f6038 (patch) | |
tree | 9ad2149b75699042d247952ab443de9c6a2a842f /arch/x86/kernel/cpu/mcheck | |
parent | perf_event, x86, mce: Use TRACE_EVENT() for MCE logging (diff) | |
parent | mce, edac: Use an atomic notifier for MCEs decoding (diff) | |
parent | x86: Don't print number of MCE banks for every CPU (diff) | |
download | linux-6b50f5c7c7163d50af0946a93b61c05e448f6038.tar.xz linux-6b50f5c7c7163d50af0946a93b61c05e448f6038.zip |
Merge branches 'x86/mce' and 'x86/urgent' into perf/mce
Merge reason: Put all MCE changes into this branch, we are
queueing up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>