summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-26 21:26:34 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-26 21:26:34 -0400
commitcbc696a5fa3942aa2e6ad52a71d5126ffa84d031 (patch)
tree98eab655c0e5d0853267557616cb7059f27f7fc9 /MAINTAINERS
parentd3f464b5385531c4250a8b1dbd2f9ba6bbfcebb9 (diff)
parent8fc29ba65bd669b8f23a46b4760f3ba773e2a635 (diff)
downloadlinux-3.10-cbc696a5fa3942aa2e6ad52a71d5126ffa84d031.tar.gz
linux-3.10-cbc696a5fa3942aa2e6ad52a71d5126ffa84d031.tar.bz2
linux-3.10-cbc696a5fa3942aa2e6ad52a71d5126ffa84d031.zip
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index aa2cfe2b6f2..31c23e3a2de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1905,6 +1905,12 @@ M: James.Bottomley@HansenPartnership.com
L: linux-scsi@vger.kernel.org
S: Maintained
+NETEM NETWORK EMULATOR
+P: Stephen Hemminger
+M: shemminger@osdl.org
+L: netem@osdl.org
+S: Maintained
+
NETFILTER/IPTABLES/IPCHAINS
P: Rusty Russell
P: Marc Boucher