diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-06 10:31:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-06-06 10:31:26 -0400 |
commit | 4b01abc977574253f466f65463019de2571c6401 (patch) | |
tree | c330615fe9f277ad51a91da3db2d690a3336fb02 /MAINTAINERS | |
parent | 47c96298cd0b04b4478206fde55fd6a6431de980 (diff) | |
parent | 1def630a6a49dda5bc89dfbd86656293640456f0 (diff) |
Merge branch 'master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 328da34a7de2..e593acee2a11 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -565,7 +565,19 @@ 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 | ||
570 | |||
571 | BROADCOM BNX2 GIGABIT ETHERNET DRIVER | ||
572 | P: Michael Chan | ||
573 | M: mchan@broadcom.com | ||
574 | L: netdev@vger.kernel.org | ||
575 | S: Supported | ||
576 | |||
577 | BROADCOM TG3 GIGABIT ETHERNET DRIVER | ||
578 | P: Michael Chan | ||
579 | M: mchan@broadcom.com | ||
580 | L: netdev@vger.kernel.org | ||
569 | S: Supported | 581 | S: Supported |
570 | 582 | ||
571 | BTTV VIDEO4LINUX DRIVER | 583 | BTTV VIDEO4LINUX DRIVER |
@@ -1734,7 +1746,7 @@ M: paulus@au.ibm.com | |||
1734 | P: Anton Blanchard | 1746 | P: Anton Blanchard |
1735 | M: anton@samba.org | 1747 | M: anton@samba.org |
1736 | M: anton@au.ibm.com | 1748 | M: anton@au.ibm.com |
1737 | W: http://linuxppc64.org | 1749 | W: http://www.penguinppc.org/ppc64/ |
1738 | L: linuxppc-dev@ozlabs.org | 1750 | L: linuxppc-dev@ozlabs.org |
1739 | S: Supported | 1751 | S: Supported |
1740 | 1752 | ||
@@ -1895,6 +1907,11 @@ L: linux-kernel@vger.kernel.org | |||
1895 | W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html | 1907 | W: http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html |
1896 | S: Maintained | 1908 | S: Maintained |
1897 | 1909 | ||
1910 | MULTIMEDIA CARD SUBSYSTEM | ||
1911 | P: Russell King | ||
1912 | M: rmk+mmc@arm.linux.org.uk | ||
1913 | S: Maintained | ||
1914 | |||
1898 | MULTISOUND SOUND DRIVER | 1915 | MULTISOUND SOUND DRIVER |
1899 | P: Andrew Veliath | 1916 | P: Andrew Veliath |
1900 | M: andrewtv@usa.net | 1917 | M: andrewtv@usa.net |
@@ -1917,6 +1934,12 @@ M: James.Bottomley@HansenPartnership.com | |||
1917 | L: linux-scsi@vger.kernel.org | 1934 | L: linux-scsi@vger.kernel.org |
1918 | S: Maintained | 1935 | S: Maintained |
1919 | 1936 | ||
1937 | NETEM NETWORK EMULATOR | ||
1938 | P: Stephen Hemminger | ||
1939 | M: shemminger@osdl.org | ||
1940 | L: netem@osdl.org | ||
1941 | S: Maintained | ||
1942 | |||
1920 | NETFILTER/IPTABLES/IPCHAINS | 1943 | NETFILTER/IPTABLES/IPCHAINS |
1921 | P: Rusty Russell | 1944 | P: Rusty Russell |
1922 | P: Marc Boucher | 1945 | P: Marc Boucher |