[PATCH 3 of 4] x86-64: Calgary IOMMU: Update Jon's contact info

From: Muli Ben-Yehuda
Date: Sat Sep 30 2006 - 04:45:11 EST


2 files changed, 3 insertions(+), 2 deletions(-)
MAINTAINERS | 2 +-
arch/x86_64/kernel/pci-calgary.c | 3 ++-


# HG changeset patch
# User Muli Ben-Yehuda <muli@xxxxxxxxxx>
# Date 1159604379 -10800
# Node ID 7aff757cee0ea0566ae4016b43a0284769b0b27a
# Parent e0562474cf16b13d8c3c815fce3159ba7cd0f540
x86-64: Calgary IOMMU: Update Jon's contact info

From: Jon Mason <jdmason@xxxxxxxx>

Also add copyright for work done after leaving IBM.

Signed-off-by: Jon Mason <jdmason@xxxxxxxx>
Signed-off-by: Muli Ben-Yehuda <muli@xxxxxxxxxx>

diff -r e0562474cf16 -r 7aff757cee0e MAINTAINERS
--- a/MAINTAINERS Sat Sep 30 11:18:31 2006 +0300
+++ b/MAINTAINERS Sat Sep 30 11:19:39 2006 +0300
@@ -643,7 +643,7 @@ P: Muli Ben-Yehuda
P: Muli Ben-Yehuda
M: muli@xxxxxxxxxx
P: Jon D. Mason
-M: jdmason@xxxxxxxxxx
+M: jdmason@xxxxxxxx
L: linux-kernel@xxxxxxxxxxxxxxx
L: discuss@xxxxxxxxxx
S: Maintained
diff -r e0562474cf16 -r 7aff757cee0e arch/x86_64/kernel/pci-calgary.c
--- a/arch/x86_64/kernel/pci-calgary.c Sat Sep 30 11:18:31 2006 +0300
+++ b/arch/x86_64/kernel/pci-calgary.c Sat Sep 30 11:19:39 2006 +0300
@@ -2,8 +2,9 @@
* Derived from arch/powerpc/kernel/iommu.c
*
* Copyright (C) IBM Corporation, 2006
+ * Copyright (C) 2006 Jon Mason <jdmason@xxxxxxxx>
*
- * Author: Jon Mason <jdmason@xxxxxxxxxx>
+ * Author: Jon Mason <jdmason@xxxxxxxx>
* Author: Muli Ben-Yehuda <muli@xxxxxxxxxx>

* This program is free software; you can redistribute it and/or modify
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/