summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2006-10-05 18:47:21 +0200
committerAndi Kleen <andi@basil.nowhere.org>2006-10-05 18:47:21 +0200
commitd8d2bedf6002bf40b07fc5989dd9dbe56609fe3e (patch)
tree1f7894af36db0508df4998f74d06577ed6545537
parent76fd231717453e06347ad17b3fc1707c6918d172 (diff)
downloadlwn-d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e.tar.gz
lwn-d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e.zip
[PATCH] x86-64: Calgary IOMMU: Update Jon's contact info
Also add copyright for work done after leaving IBM. Signed-off-by: Jon Mason <jdmason@kudzu.us> Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r--MAINTAINERS2
-rw-r--r--arch/x86_64/kernel/pci-calgary.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 17becb9b1a96..84a018ee4556 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -641,7 +641,7 @@ CALGARY x86-64 IOMMU
P: Muli Ben-Yehuda
M: muli@il.ibm.com
P: Jon D. Mason
-M: jdmason@us.ibm.com
+M: jdmason@kudzu.us
L: linux-kernel@vger.kernel.org
L: discuss@x86-64.org
S: Maintained
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index 3c0c7fde09d8..c4692b67878a 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary.c
@@ -2,8 +2,9 @@
* Derived from arch/powerpc/kernel/iommu.c
*
* Copyright (C) IBM Corporation, 2006
+ * Copyright (C) 2006 Jon Mason <jdmason@kudzu.us>
*
- * Author: Jon Mason <jdmason@us.ibm.com>
+ * Author: Jon Mason <jdmason@kudzu.us>
* Author: Muli Ben-Yehuda <muli@il.ibm.com>
* This program is free software; you can redistribute it and/or modify