diff options
author | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-12 02:15:47 -0400 |
commit | 7fe13c5733790ef582769a54693fa6a5abf3c032 (patch) | |
tree | 567eb4394b642ddc81ff05521329d75d1cf47b88 /MAINTAINERS | |
parent | 8aa0f64ac3835a6daf84d0b0e07c4c01d7d8eddc (diff) | |
parent | 10c435f18b8cb78a5870c08d52955594f5ec9c31 (diff) |
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 | |||
3643 | F: drivers/block/nbd.c | 3643 | F: drivers/block/nbd.c |
3644 | F: include/linux/nbd.h | 3644 | F: include/linux/nbd.h |
3645 | 3645 | ||
3646 | NETWORK DROP MONITOR | ||
3647 | M: Neil Horman <nhorman@tuxdriver.com> | ||
3648 | L: netdev@vger.kernel.org | ||
3649 | S: Maintained | ||
3650 | W: https://fedorahosted.org/dropwatch/ | ||
3651 | F: net/core/drop_monitor.c | ||
3652 | |||
3646 | NETWORKING [GENERAL] | 3653 | NETWORKING [GENERAL] |
3647 | M: "David S. Miller" <davem@davemloft.net> | 3654 | M: "David S. Miller" <davem@davemloft.net> |
3648 | L: netdev@vger.kernel.org | 3655 | L: netdev@vger.kernel.org |