aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS12
1 files changed, 5 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cb5425e3cd42..b7adeed338d4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1978,10 +1978,7 @@ S: Maintained
1978F: drivers/net/ethernet/ti/cpmac.c 1978F: drivers/net/ethernet/ti/cpmac.c
1979 1979
1980CPU FREQUENCY DRIVERS 1980CPU FREQUENCY DRIVERS
1981M: Dave Jones <davej@redhat.com>
1982L: cpufreq@vger.kernel.org 1981L: cpufreq@vger.kernel.org
1983W: http://www.codemonkey.org.uk/projects/cpufreq/
1984T: git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
1985S: Maintained 1982S: Maintained
1986F: drivers/cpufreq/ 1983F: drivers/cpufreq/
1987F: include/linux/cpufreq.h 1984F: include/linux/cpufreq.h
@@ -3602,6 +3599,7 @@ S: Supported
3602F: drivers/net/wireless/iwlegacy/ 3599F: drivers/net/wireless/iwlegacy/
3603 3600
3604INTEL WIRELESS WIFI LINK (iwlwifi) 3601INTEL WIRELESS WIFI LINK (iwlwifi)
3602M: Johannes Berg <johannes.berg@intel.com>
3605M: Wey-Yi Guy <wey-yi.w.guy@intel.com> 3603M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
3606M: Intel Linux Wireless <ilw@linux.intel.com> 3604M: Intel Linux Wireless <ilw@linux.intel.com>
3607L: linux-wireless@vger.kernel.org 3605L: linux-wireless@vger.kernel.org
@@ -5901,11 +5899,11 @@ F: Documentation/scsi/st.txt
5901F: drivers/scsi/st* 5899F: drivers/scsi/st*
5902 5900
5903SCTP PROTOCOL 5901SCTP PROTOCOL
5904M: Vlad Yasevich <vladislav.yasevich@hp.com> 5902M: Vlad Yasevich <vyasevich@gmail.com>
5905M: Sridhar Samudrala <sri@us.ibm.com> 5903M: Sridhar Samudrala <sri@us.ibm.com>
5906L: linux-sctp@vger.kernel.org 5904L: linux-sctp@vger.kernel.org
5907W: http://lksctp.sourceforge.net 5905W: http://lksctp.sourceforge.net
5908S: Supported 5906S: Maintained
5909F: Documentation/networking/sctp.txt 5907F: Documentation/networking/sctp.txt
5910F: include/linux/sctp.h 5908F: include/linux/sctp.h
5911F: include/net/sctp/ 5909F: include/net/sctp/
@@ -7586,8 +7584,8 @@ F: Documentation/filesystems/xfs.txt
7586F: fs/xfs/ 7584F: fs/xfs/
7587 7585
7588XILINX AXI ETHERNET DRIVER 7586XILINX AXI ETHERNET DRIVER
7589M: Ariane Keller <ariane.keller@tik.ee.ethz.ch> 7587M: Anirudha Sarangi <anirudh@xilinx.com>
7590M: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> 7588M: John Linn <John.Linn@xilinx.com>
7591S: Maintained 7589S: Maintained
7592F: drivers/net/ethernet/xilinx/xilinx_axienet* 7590F: drivers/net/ethernet/xilinx/xilinx_axienet*
7593 7591