summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 13:23:26 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-19 13:23:26 -0800
commit2370965c5065b24b28b5ba09b60ddfbfb6d7649b (patch)
tree1929618e9d904bdd0f050c95053b8b59145f670e /MAINTAINERS
parent59b8175c771040afcd4ad67022b0cc80c216b866 (diff)
parent0b3581e26d4807f36b2294366d6fbd506c30d68a (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (51 commits) sk98lin: mark deprecated in Kconfig Hostess SV-11 depends on INET Fix link autonegotiation timer. sk98lin: planned removal B44: increase wait loop b44: replace define e1000: allow ethtool to see link status when down e1000: remove obsolete custom pci_save_state code e1000: fix shared interrupt warning message atm: Use ARRAY_SIZE macro when appropriate bugfixes and new hardware support for arcnet driver pcnet32 NAPI no longer experimental MAINTAINER macb: Remove inappropriate spinlocks around mii calls Convert meth to netdev_priv sky2: v1.13 sky2: receive error handling improvements sky2: transmit timeout sky2: flow control negotiation for Yukon-FE sky2: no need to reset pause bits on shutdown ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a384551a597..270c6b006b9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2630,8 +2630,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
S: Maintained
PCNET32 NETWORK DRIVER
-P: Thomas Bogend�rfer
-M: tsbogend@alpha.franken.de
+P: Don Fry
+M: pcnet32@verizon.net
L: netdev@vger.kernel.org
S: Maintained