summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/mca.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-02-06 17:04:00 +0100
committerSteve French <sfrench@us.ibm.com>2008-02-06 17:04:00 +0100
commitf315ccb3e679f271583f2a4f463ad9b65665b751 (patch)
tree44eb52102587d7b0bb592464cef6ec04bcac8b90 /include/asm-ia64/mca.h
parent[CIFS] fix warning in cifs_spnego.c (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
downloadlinux-f315ccb3e679f271583f2a4f463ad9b65665b751.tar.xz
linux-f315ccb3e679f271583f2a4f463ad9b65665b751.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-ia64/mca.h')
-rw-r--r--include/asm-ia64/mca.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-ia64/mca.h b/include/asm-ia64/mca.h
index 823553bf12e6..f1663aa94a52 100644
--- a/include/asm-ia64/mca.h
+++ b/include/asm-ia64/mca.h
@@ -3,9 +3,9 @@
* Purpose: Machine check handling specific defines
*
* Copyright (C) 1999, 2004 Silicon Graphics, Inc.
- * Copyright (C) Vijay Chander (vijay@engr.sgi.com)
- * Copyright (C) Srinivasa Thirumalachar (sprasad@engr.sgi.com)
- * Copyright (C) Russ Anderson (rja@sgi.com)
+ * Copyright (C) Vijay Chander <vijay@engr.sgi.com>
+ * Copyright (C) Srinivasa Thirumalachar <sprasad@engr.sgi.com>
+ * Copyright (C) Russ Anderson <rja@sgi.com>
*/
#ifndef _ASM_IA64_MCA_H