diff options
author | Ingo Molnar | 2009-08-23 11:18:47 +0200 |
---|---|---|
committer | Ingo Molnar | 2009-08-23 11:18:47 +0200 |
commit | 8a517c514d5893602cf85c1b4c47afbbc04d2198 (patch) | |
tree | e7c40f68ef97bb2bdb4c366c0b45437bc049feb1 /arch/mips/pci/pci-vr41xx.c | |
parent | x86, cpu: cpu/proc.c display cache alignment and address sizes for 32 bit (diff) | |
parent | Linux 2.6.31-rc7 (diff) | |
download | kernel-qcow2-linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.tar.gz kernel-qcow2-linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.tar.xz kernel-qcow2-linux-8a517c514d5893602cf85c1b4c47afbbc04d2198.zip |
Merge commit 'v2.6.31-rc7' into x86/cpu
Diffstat (limited to 'arch/mips/pci/pci-vr41xx.c')
-rw-r--r-- | arch/mips/pci/pci-vr41xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/pci/pci-vr41xx.c b/arch/mips/pci/pci-vr41xx.c index d1e049b55f34..56525711f8b7 100644 --- a/arch/mips/pci/pci-vr41xx.c +++ b/arch/mips/pci/pci-vr41xx.c @@ -2,8 +2,8 @@ * pci-vr41xx.c, PCI Control Unit routines for the NEC VR4100 series. * * Copyright (C) 2001-2003 MontaVista Software Inc. - * Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com> - * Copyright (C) 2004-2008 Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> + * Author: Yoichi Yuasa <source@mvista.com> + * Copyright (C) 2004-2008 Yoichi Yuasa <yuasa@linux-mips.org> * Copyright (C) 2004 by Ralf Baechle (ralf@linux-mips.org) * * This program is free software; you can redistribute it and/or modify @@ -22,7 +22,7 @@ */ /* * Changes: - * MontaVista Software Inc. <yyuasa@mvista.com> or <source@mvista.com> + * MontaVista Software Inc. <source@mvista.com> * - New creation, NEC VR4122 and VR4131 are supported. */ #include <linux/init.h> |