Merge redhat.com:/spare/repo/netdev-2.6/r8169

into redhat.com:/spare/repo/net-drivers-2.6

Merge redhat.com:/spare/repo/netdev-2.6/r8169
into redhat.com:/spare/repo/net-drivers-2.6
523f0519 · Jeff Garzik · 62c6cb13 · 86af9cf0 · 523f0519 · 523f0519
Commit 523f0519 authored Apr 13, 2004 by Jeff Garzik
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 794 additions and 218 deletions

MAINTAINERS MAINTAINERS +6 -0

drivers/net/r8169.c drivers/net/r8169.c +788 -218

No files found.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -113,6 +113,12 @@ M:	jgarzik@pobox.com
 W:	http://sourceforge.net/projects/gkernel/
 S:	Maintained

+8169 10/100/1000 GIGABIT ETHERNET DRIVER
+P:	Francois Romieu
+M:	romieu@fr.zoreil.com
+L:	netdev@oss.sgi.com
+S:	Maintained
+
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 P:	Russell King
 M:	rmk+serial@arm.linux.org.uk

--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c