| commit | 813400060fe2824163cabd9afed4e476e7ce282e | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Jun 17 18:21:41 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Jun 17 18:21:41 2009 +0200 |
| tree | 22141d6e937991761345a63dd80125be13eb50ea | |
| 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>