aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/mcheck/non-fatal.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-22 19:34:09 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-22 19:34:09 +0100
commitf20e3b5fe7ead0615309433260b9784d8da0bbbd (patch)
treeeabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/x86/kernel/cpu/mcheck/non-fatal.c
parentbcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff)
parentf030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff)
downloadkernel_samsung_smdk4412-f20e3b5fe7ead0615309433260b9784d8da0bbbd.tar.gz
kernel_samsung_smdk4412-f20e3b5fe7ead0615309433260b9784d8da0bbbd.tar.bz2
kernel_samsung_smdk4412-f20e3b5fe7ead0615309433260b9784d8da0bbbd.zip
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/x86/kernel/cpu/mcheck/non-fatal.c')
-rw-r--r--arch/x86/kernel/cpu/mcheck/non-fatal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/non-fatal.c b/arch/x86/kernel/cpu/mcheck/non-fatal.c
index cc1fccdd31e..a74af128efc 100644
--- a/arch/x86/kernel/cpu/mcheck/non-fatal.c
+++ b/arch/x86/kernel/cpu/mcheck/non-fatal.c
@@ -1,7 +1,7 @@
/*
* Non Fatal Machine Check Exception Reporting
*
- * (C) Copyright 2002 Dave Jones. <davej@codemonkey.org.uk>
+ * (C) Copyright 2002 Dave Jones. <davej@redhat.com>
*
* This file contains routines to check for non-fatal MCEs every 15s
*