aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Mason <jdmason@kudzu.us>2006-10-05 12:47:21 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-10-05 12:47:21 -0400
commitd8d2bedf6002bf40b07fc5989dd9dbe56609fe3e (patch)
tree1f7894af36db0508df4998f74d06577ed6545537
parent76fd231717453e06347ad17b3fc1707c6918d172 (diff)
[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
641P: Muli Ben-Yehuda 641P: Muli Ben-Yehuda
642M: muli@il.ibm.com 642M: muli@il.ibm.com
643P: Jon D. Mason 643P: Jon D. Mason
644M: jdmason@us.ibm.com 644M: jdmason@kudzu.us
645L: linux-kernel@vger.kernel.org 645L: linux-kernel@vger.kernel.org
646L: discuss@x86-64.org 646L: discuss@x86-64.org
647S: Maintained 647S: 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 @@
2 * Derived from arch/powerpc/kernel/iommu.c 2 * Derived from arch/powerpc/kernel/iommu.c
3 * 3 *
4 * Copyright (C) IBM Corporation, 2006 4 * Copyright (C) IBM Corporation, 2006
5 * Copyright (C) 2006 Jon Mason <jdmason@kudzu.us>
5 * 6 *
6 * Author: Jon Mason <jdmason@us.ibm.com> 7 * Author: Jon Mason <jdmason@kudzu.us>
7 * Author: Muli Ben-Yehuda <muli@il.ibm.com> 8 * Author: Muli Ben-Yehuda <muli@il.ibm.com>
8 9
9 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify