diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index aa2cfe2b6f24..31c23e3a2de9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1905,6 +1905,12 @@ M: James.Bottomley@HansenPartnership.com | |||
1905 | L: linux-scsi@vger.kernel.org | 1905 | L: linux-scsi@vger.kernel.org |
1906 | S: Maintained | 1906 | S: Maintained |
1907 | 1907 | ||
1908 | NETEM NETWORK EMULATOR | ||
1909 | P: Stephen Hemminger | ||
1910 | M: shemminger@osdl.org | ||
1911 | L: netem@osdl.org | ||
1912 | S: Maintained | ||
1913 | |||
1908 | NETFILTER/IPTABLES/IPCHAINS | 1914 | NETFILTER/IPTABLES/IPCHAINS |
1909 | P: Rusty Russell | 1915 | P: Rusty Russell |
1910 | P: Marc Boucher | 1916 | P: Marc Boucher |