Merge branch 'upstream-fixes' into upstream

[linux-2.6-omap-h63xx.git] / drivers / net / tulip / pnic.c

diff --git a/drivers/net/tulip/pnic.c b/drivers/net/tulip/pnic.c
index ca7e53246adb07a6e5bff26fa65cf37a2f42d1aa..85a521e0d0526c0f879dff6346cea79984480631 100644 (file)
--- a/drivers/net/tulip/pnic.c
+++ b/drivers/net/tulip/pnic.c
@@ -1,7 +1,7 @@
 /*
        drivers/net/tulip/pnic.c
 
-       Maintained by Jeff Garzik <jgarzik@pobox.com>
+       Maintained by Valerie Henson <val_henson@linux.intel.com>
        Copyright 2000,2001  The Linux Kernel Team
        Written/copyright 1994-2001 by Donald Becker.