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/include/asm/mce.h | |
| parent | 8968f9d3dc23d9a1821d97c6f11e72a59382e56c (diff) | |
| parent | fb2531953fd8855abdcf458459020fd382c5deca (diff) | |
| parent | 93ae5012a79b11e7fc855b52c7ce1e16fe1540b0 (diff) | |
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>