summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/iseries/iommu.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-25 09:42:19 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-25 09:42:19 -0800
commitaf95598744a83506063b411d81c4f819bf774f62 (patch)
treee0ad781a5c7718bb40f0b0f4cd47ada937f21d7b /arch/powerpc/platforms/iseries/iommu.c
parent4ad5bd25683ae3a913efb7d5afb7ddf2b2ef09db (diff)
parent9a94c5793a7b44720f19ebb71b636bc9c31b44d8 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/platforms/iseries/iommu.c')
-rw-r--r--arch/powerpc/platforms/iseries/iommu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index bf081b34582..2b54eeb2c89 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -3,7 +3,7 @@
*
* Rewrite, cleanup:
*
- * Copyright (C) 2004 Olof Johansson <olof@austin.ibm.com>, IBM Corporation
+ * Copyright (C) 2004 Olof Johansson <olof@lixom.net>, IBM Corporation
*
* Dynamic DMA mapping support, iSeries-specific parts.
*