Merge branch 'x86/mce' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Dec 2009 19:33:51 +0000 (20:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Dec 2009 19:33:53 +0000 (20:33 +0100)
commitbf08b3b1a1d06e92036a0c4f144b64fe6be2bffa
treeda227906ed08546b9cb09c59d92c0b766a1aea8e
parentab1eebe77dd08b26585860d534e07810d1cd274d
parent6ac5c5310ca9d7dd3d7e677c2715b1f06a348330
Merge branch 'x86/mce' into x86/urgent

Merge reason: Leftover mini-topic from the merge window - merge it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>