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