diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-26 22:13:33 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-26 22:13:33 (GMT) |
commit | ecd68853b852cdafb138f9c437f3a751fe7dc381 (patch) | |
tree | 6b3a3468d0d3dca7f226de7e3551913d907b17a2 /MAINTAINERS | |
parent | 087377a4307e18225f6452af5e71fe763c088c4e (diff) | |
parent | 3041a069090224462e27da1bc9483b463eb40841 (diff) | |
download | linux-fsl-qoriq-ecd68853b852cdafb138f9c437f3a751fe7dc381.tar.xz |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: dev.c comment fixes
[IPV6] ROUTE: Don't try less preferred routes for on-link routes.
[IRDA]: *_DONGLE should depend on IRTTY_SIR
[MAINTAINERS]: Add entry for netem
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bd10b2a..92d6968 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1899,6 +1899,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 |