Merge branch 'x86/urgent' into x86/mce3
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 16:21:41 +0000 (18:21 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 16:21:41 +0000 (18:21 +0200)
commit813400060fe2824163cabd9afed4e476e7ce282e
tree22141d6e937991761345a63dd80125be13eb50ea
parent1bf7b31efa0c322d93cb3f772cd9bc743e8bb42d
parentfe955e5c793aab398794be4c5ede172d48446c4a
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>
arch/x86/kernel/cpu/mcheck/mce.c