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/x86/include/asm/alternative.h | |
| parent | 1bf7b31efa0c322d93cb3f772cd9bc743e8bb42d (diff) | |
| parent | fe955e5c793aab398794be4c5ede172d48446c4a (diff) | |
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/x86/include/asm/alternative.h')
0 files changed, 0 insertions, 0 deletions