aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS6
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
1899L: linux-scsi@vger.kernel.org 1899L: linux-scsi@vger.kernel.org
1900S: Maintained 1900S: Maintained
1901 1901
1902NETEM NETWORK EMULATOR
1903P: Stephen Hemminger
1904M: shemminger@osdl.org
1905L: netem@osdl.org
1906S: Maintained
1907
1902NETFILTER/IPTABLES/IPCHAINS 1908NETFILTER/IPTABLES/IPCHAINS
1903P: Rusty Russell 1909P: Rusty Russell
1904P: Marc Boucher 1910P: Marc Boucher