diff options
author | 2009-10-11 23:15:47 -0700 | |
---|---|---|
committer | 2009-10-11 23:15:47 -0700 | |
commit | 7fe13c5733790ef582769a54693fa6a5abf3c032 (patch) | |
tree | 567eb4394b642ddc81ff05521329d75d1cf47b88 /MAINTAINERS | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
parent | net: Link in PHY drivers before others. (diff) | |
download | linux-7fe13c5733790ef582769a54693fa6a5abf3c032.tar.gz linux-7fe13c5733790ef582769a54693fa6a5abf3c032.tar.bz2 linux-7fe13c5733790ef582769a54693fa6a5abf3c032.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 09a2028bab7f..c57c2e6c8d27 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3643,6 +3643,13 @@ F: Documentation/blockdev/nbd.txt F: drivers/block/nbd.c F: include/linux/nbd.h +NETWORK DROP MONITOR +M: Neil Horman <nhorman@tuxdriver.com> +L: netdev@vger.kernel.org +S: Maintained +W: https://fedorahosted.org/dropwatch/ +F: net/core/drop_monitor.c + NETWORKING [GENERAL] M: "David S. Miller" <davem@davemloft.net> L: netdev@vger.kernel.org |