diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index bd10b2af2223..74d71cafb17c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -565,7 +565,7 @@ BROADBAND PROCESSOR ARCHITECTURE | |||
565 | P: Arnd Bergmann | 565 | P: Arnd Bergmann |
566 | M: arnd@arndb.de | 566 | M: arnd@arndb.de |
567 | L: linuxppc-dev@ozlabs.org | 567 | L: linuxppc-dev@ozlabs.org |
568 | W: http://linuxppc64.org | 568 | W: http://www.penguinppc.org/ppc64/ |
569 | S: Supported | 569 | S: Supported |
570 | 570 | ||
571 | BTTV VIDEO4LINUX DRIVER | 571 | BTTV VIDEO4LINUX DRIVER |
@@ -1716,7 +1716,7 @@ M: paulus@au.ibm.com | |||
1716 | P: Anton Blanchard | 1716 | P: Anton Blanchard |
1717 | M: anton@samba.org | 1717 | M: anton@samba.org |
1718 | M: anton@au.ibm.com | 1718 | M: anton@au.ibm.com |
1719 | W: http://linuxppc64.org | 1719 | W: http://www.penguinppc.org/ppc64/ |
1720 | L: linuxppc-dev@ozlabs.org | 1720 | L: linuxppc-dev@ozlabs.org |
1721 | S: Supported | 1721 | S: Supported |
1722 | 1722 | ||
@@ -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 |