diff --git a/[refs] b/[refs]
index d8c9ed2a96bc..652ffdbeeb93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76fd231717453e06347ad17b3fc1707c6918d172
+refs/heads/master: d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 17becb9b1a96..84a018ee4556 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/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/trunk/arch/x86_64/kernel/pci-calgary.c b/trunk/arch/x86_64/kernel/pci-calgary.c
index 3c0c7fde09d8..c4692b67878a 100644
--- a/trunk/arch/x86_64/kernel/pci-calgary.c
+++ b/trunk/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