aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
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
565P: Arnd Bergmann 565P: Arnd Bergmann
566M: arnd@arndb.de 566M: arnd@arndb.de
567L: linuxppc-dev@ozlabs.org 567L: linuxppc-dev@ozlabs.org
568W: http://linuxppc64.org 568W: http://www.penguinppc.org/ppc64/
569S: Supported 569S: Supported
570 570
571BTTV VIDEO4LINUX DRIVER 571BTTV VIDEO4LINUX DRIVER
@@ -1716,7 +1716,7 @@ M: paulus@au.ibm.com
1716P: Anton Blanchard 1716P: Anton Blanchard
1717M: anton@samba.org 1717M: anton@samba.org
1718M: anton@au.ibm.com 1718M: anton@au.ibm.com
1719W: http://linuxppc64.org 1719W: http://www.penguinppc.org/ppc64/
1720L: linuxppc-dev@ozlabs.org 1720L: linuxppc-dev@ozlabs.org
1721S: Supported 1721S: Supported
1722 1722
@@ -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