aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
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
1905L: linux-scsi@vger.kernel.org 1905L: linux-scsi@vger.kernel.org
1906S: Maintained 1906S: Maintained
1907 1907
1908NETEM NETWORK EMULATOR
1909P: Stephen Hemminger
1910M: shemminger@osdl.org
1911L: netem@osdl.org
1912S: Maintained
1913
1908NETFILTER/IPTABLES/IPCHAINS 1914NETFILTER/IPTABLES/IPCHAINS
1909P: Rusty Russell 1915P: Rusty Russell
1910P: Marc Boucher 1916P: Marc Boucher