aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-12-17 15:27:22 -0500
committerDavid S. Miller <davem@davemloft.net>2010-12-17 15:27:22 -0500
commitb4aa9e05a61b845541fa6f5b1d246976922601f0 (patch)
treeca94478c3df281ab76a3399f5ba6341ade3f5791 /MAINTAINERS
parent1dc0f3c54ce1df957f99c17b145488fd03eb1a59 (diff)
parent4b8fe66300acb2fba8b16d62606e0d30204022fc (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2a5e60fb3b5d..f5630a5b3f49 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5943,7 +5943,6 @@ F: include/linux/tty.h
5943 5943
5944TULIP NETWORK DRIVERS 5944TULIP NETWORK DRIVERS
5945M: Grant Grundler <grundler@parisc-linux.org> 5945M: Grant Grundler <grundler@parisc-linux.org>
5946M: Kyle McMartin <kyle@mcmartin.ca>
5947L: netdev@vger.kernel.org 5946L: netdev@vger.kernel.org
5948S: Maintained 5947S: Maintained
5949F: drivers/net/tulip/ 5948F: drivers/net/tulip/