diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-17 18:21:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-17 18:21:41 +0200 |
| commit | 813400060fe2824163cabd9afed4e476e7ce282e (patch) | |
| tree | 22141d6e937991761345a63dd80125be13eb50ea /arch/.gitignore | |
| parent | x86, mce: mce_intel.c needs <asm/apic.h> (diff) | |
| parent | x86: nmi: Add Intel processor 0x6f4 to NMI perfctr1 workaround (diff) | |
| download | linux-813400060fe2824163cabd9afed4e476e7ce282e.tar.xz linux-813400060fe2824163cabd9afed4e476e7ce282e.zip | |
Merge branch 'x86/urgent' into x86/mce3
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_intel.c
Merge reason: merge with an urgent-branch MCE fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/.gitignore')
0 files changed, 0 insertions, 0 deletions