diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-21 01:32:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-21 01:32:26 -0700 |
| commit | e5e9743bb7429f53c83ad69b432f7b661e74c3f0 (patch) | |
| tree | db3691aef0d46c4aed4a2be6dc8ab7c44c3488cb /MAINTAINERS | |
| parent | a0f82f64e26929776c58a5c93c2ecb38e3d82815 (diff) | |
| parent | 775d8d931581764a1ec982ebe5a927b12762fb6d (diff) | |
| download | op-kernel-dev-e5e9743bb7429f53c83ad69b432f7b661e74c3f0.zip op-kernel-dev-e5e9743bb7429f53c83ad69b432f7b661e74c3f0.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/core/dev.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cb44e1c..2dc197c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3920,8 +3920,8 @@ NETWORKING [GENERAL] P: David S. Miller M: davem@davemloft.net L: netdev@vger.kernel.org -W: http://linux-net.osdl.org/ -T: git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git +W: http://www.linuxfoundation.org/en/Net +T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git S: Maintained F: net/ F: include/net/ @@ -3962,6 +3962,13 @@ F: net/wireless/ F: include/net/ieee80211* F: include/net/wireless.h +NETWORKING DRIVERS +L: netdev@vger.kernel.org +W: http://www.linuxfoundation.org/en/Net +T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git +S: Odd Fixes +F: drivers/net/ + NETXEN (1/10) GbE SUPPORT P: Dhananjay Phadke M: dhananjay@netxen.com |
