From d36a9d64602f335639168c387b9b39ca2fcbd19f Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Thu, 5 Oct 2006 18:47:21 +0200 Subject: [PATCH] --- yaml --- r: 39017 b: refs/heads/master c: d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e h: refs/heads/master i: 39015: 9ba6926c436f03dca1dd813c1e7ae0d53ea8a9f3 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 2 +- trunk/arch/x86_64/kernel/pci-calgary.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) 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 * - * Author: Jon Mason + * Author: Jon Mason * Author: Muli Ben-Yehuda * This program is free software; you can redistribute it and/or modify