diff options
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bd10b2af2223..92d696874965 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1899,6 +1899,12 @@ M: James.Bottomley@HansenPartnership.com | |||
1899 | L: linux-scsi@vger.kernel.org | 1899 | L: linux-scsi@vger.kernel.org |
1900 | S: Maintained | 1900 | S: Maintained |
1901 | 1901 | ||
1902 | NETEM NETWORK EMULATOR | ||
1903 | P: Stephen Hemminger | ||
1904 | M: shemminger@osdl.org | ||
1905 | L: netem@osdl.org | ||
1906 | S: Maintained | ||
1907 | |||
1902 | NETFILTER/IPTABLES/IPCHAINS | 1908 | NETFILTER/IPTABLES/IPCHAINS |
1903 | P: Rusty Russell | 1909 | P: Rusty Russell |
1904 | P: Marc Boucher | 1910 | P: Marc Boucher |