Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

[linux-2.6-omap-h63xx.git] / Documentation / networking / cs89x0.txt

diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index 6387d3decf858a7c83d2ae65f06c6eccdfa7dfae..c725d33b316fbadebb0d93d1fb70c193318ac1a2 100644 (file)
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -3,7 +3,7 @@ NOTE
 ----
 
 This document was contributed by Cirrus Logic for kernel 2.2.5.  This version
 ----
 
 This document was contributed by Cirrus Logic for kernel 2.2.5.  This version

-has been updated for 2.3.48 by Andrew Morton <andrewm@uow.edu.au>
+has been updated for 2.3.48 by Andrew Morton.

 
 Cirrus make a copy of this driver available at their website, as
 described below.  In general, you should use the driver version which
 
 Cirrus make a copy of this driver available at their website, as
 described below.  In general, you should use the driver version which


@@ -690,7 +690,7 @@ latest drivers and technical publications.
 6.4 Current maintainer
 
 In February 2000 the maintenance of this driver was assumed by Andrew
 6.4 Current maintainer
 
 In February 2000 the maintenance of this driver was assumed by Andrew

-Morton <akpm@zip.com.au>
+Morton.

 
 6.5 Kernel module parameters
 
 
 6.5 Kernel module parameters