From 20c4484eb0ae43d8e057df6c65a01662e5dcb4d8 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 18 Jun 2011 22:51:13 +0200
Subject: [PATCH] --- yaml --- r: 253801 b: refs/heads/master c:
 c1f5c54b57341e872a9d375dccef7257f86033ef h: refs/heads/master i:   253799:
 7d2ba4664ed427e5e0c8a8eb3141783b46c736f3 v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f11bf836cd10..f66f972ac252 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d68dc3f1003a38948c55c803c32d1989dd49198
+refs/heads/master: c1f5c54b57341e872a9d375dccef7257f86033ef
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 502f2dd761eb..b12b8c13f53a 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -7007,6 +7007,13 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.
 S:	Maintained
 F:	drivers/platform/x86
 
+X86 MCE INFRASTRUCTURE
+M:	Tony Luck <tony.luck@intel.com>
+M:	Borislav Petkov <bp@amd64.org>
+L:	linux-edac@vger.kernel.org
+S:	Maintained
+F:	arch/x86/kernel/cpu/mcheck/*
+
 XEN HYPERVISOR INTERFACE
 M:	Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
 M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>