diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0d83e5898233..75760e796ae3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -885,7 +885,7 @@ S: Supported | |||
885 | 885 | ||
886 | ARM/QUALCOMM MSM MACHINE SUPPORT | 886 | ARM/QUALCOMM MSM MACHINE SUPPORT |
887 | M: David Brown <davidb@codeaurora.org> | 887 | M: David Brown <davidb@codeaurora.org> |
888 | M: Daniel Walker <dwalker@codeaurora.org> | 888 | M: Daniel Walker <dwalker@fifo99.com> |
889 | M: Bryan Huntsman <bryanh@codeaurora.org> | 889 | M: Bryan Huntsman <bryanh@codeaurora.org> |
890 | L: linux-arm-msm@vger.kernel.org | 890 | L: linux-arm-msm@vger.kernel.org |
891 | F: arch/arm/mach-msm/ | 891 | F: arch/arm/mach-msm/ |
@@ -1467,6 +1467,7 @@ F: include/net/bluetooth/ | |||
1467 | 1467 | ||
1468 | BONDING DRIVER | 1468 | BONDING DRIVER |
1469 | M: Jay Vosburgh <fubar@us.ibm.com> | 1469 | M: Jay Vosburgh <fubar@us.ibm.com> |
1470 | M: Andy Gospodarek <andy@greyhouse.net> | ||
1470 | L: netdev@vger.kernel.org | 1471 | L: netdev@vger.kernel.org |
1471 | W: http://sourceforge.net/projects/bonding/ | 1472 | W: http://sourceforge.net/projects/bonding/ |
1472 | S: Supported | 1473 | S: Supported |
@@ -1692,6 +1693,13 @@ M: Andy Whitcroft <apw@canonical.com> | |||
1692 | S: Supported | 1693 | S: Supported |
1693 | F: scripts/checkpatch.pl | 1694 | F: scripts/checkpatch.pl |
1694 | 1695 | ||
1696 | CHINESE DOCUMENTATION | ||
1697 | M: Harry Wei <harryxiyou@gmail.com> | ||
1698 | L: xiyoulinuxkernelgroup@googlegroups.com | ||
1699 | L: linux-kernel@zh-kernel.org (moderated for non-subscribers) | ||
1700 | S: Maintained | ||
1701 | F: Documentation/zh_CN/ | ||
1702 | |||
1695 | CISCO VIC ETHERNET NIC DRIVER | 1703 | CISCO VIC ETHERNET NIC DRIVER |
1696 | M: Christian Benvenuti <benve@cisco.com> | 1704 | M: Christian Benvenuti <benve@cisco.com> |
1697 | M: Vasanthy Kolluri <vkolluri@cisco.com> | 1705 | M: Vasanthy Kolluri <vkolluri@cisco.com> |
@@ -2027,7 +2035,7 @@ F: Documentation/scsi/dc395x.txt | |||
2027 | F: drivers/scsi/dc395x.* | 2035 | F: drivers/scsi/dc395x.* |
2028 | 2036 | ||
2029 | DCCP PROTOCOL | 2037 | DCCP PROTOCOL |
2030 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 2038 | M: Gerrit Renker <gerrit@erg.abdn.ac.uk> |
2031 | L: dccp@vger.kernel.org | 2039 | L: dccp@vger.kernel.org |
2032 | W: http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp | 2040 | W: http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp |
2033 | S: Maintained | 2041 | S: Maintained |
@@ -2874,7 +2882,6 @@ M: Guenter Roeck <guenter.roeck@ericsson.com> | |||
2874 | L: lm-sensors@lm-sensors.org | 2882 | L: lm-sensors@lm-sensors.org |
2875 | W: http://www.lm-sensors.org/ | 2883 | W: http://www.lm-sensors.org/ |
2876 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ | 2884 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ |
2877 | T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/ | ||
2878 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git | 2885 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git |
2879 | S: Maintained | 2886 | S: Maintained |
2880 | F: Documentation/hwmon/ | 2887 | F: Documentation/hwmon/ |
@@ -5269,7 +5276,7 @@ S: Maintained | |||
5269 | F: drivers/net/wireless/rtl818x/rtl8180/ | 5276 | F: drivers/net/wireless/rtl818x/rtl8180/ |
5270 | 5277 | ||
5271 | RTL8187 WIRELESS DRIVER | 5278 | RTL8187 WIRELESS DRIVER |
5272 | M: Herton Ronaldo Krzesinski <herton@mandriva.com.br> | 5279 | M: Herton Ronaldo Krzesinski <herton@canonical.com> |
5273 | M: Hin-Tak Leung <htl10@users.sourceforge.net> | 5280 | M: Hin-Tak Leung <htl10@users.sourceforge.net> |
5274 | M: Larry Finger <Larry.Finger@lwfinger.net> | 5281 | M: Larry Finger <Larry.Finger@lwfinger.net> |
5275 | L: linux-wireless@vger.kernel.org | 5282 | L: linux-wireless@vger.kernel.org |
@@ -6107,7 +6114,7 @@ S: Maintained | |||
6107 | F: security/tomoyo/ | 6114 | F: security/tomoyo/ |
6108 | 6115 | ||
6109 | TOPSTAR LAPTOP EXTRAS DRIVER | 6116 | TOPSTAR LAPTOP EXTRAS DRIVER |
6110 | M: Herton Ronaldo Krzesinski <herton@mandriva.com.br> | 6117 | M: Herton Ronaldo Krzesinski <herton@canonical.com> |
6111 | L: platform-driver-x86@vger.kernel.org | 6118 | L: platform-driver-x86@vger.kernel.org |
6112 | S: Maintained | 6119 | S: Maintained |
6113 | F: drivers/platform/x86/topstar-laptop.c | 6120 | F: drivers/platform/x86/topstar-laptop.c |