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 1a2f8f5823e0..707163365a93 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1968,10 +1968,7 @@ S: Maintained
1968F: drivers/net/ethernet/ti/cpmac.c 1968F: drivers/net/ethernet/ti/cpmac.c
1969 1969
1970CPU FREQUENCY DRIVERS 1970CPU FREQUENCY DRIVERS
1971M: Dave Jones <davej@redhat.com>
1972L: cpufreq@vger.kernel.org 1971L: cpufreq@vger.kernel.org
1973W: http://www.codemonkey.org.uk/projects/cpufreq/
1974T: git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git
1975S: Maintained 1972S: Maintained
1976F: drivers/cpufreq/ 1973F: drivers/cpufreq/
1977F: include/linux/cpufreq.h 1974F: include/linux/cpufreq.h
@@ -3592,6 +3589,7 @@ S: Supported
3592F: drivers/net/wireless/iwlegacy/ 3589F: drivers/net/wireless/iwlegacy/
3593 3590
3594INTEL WIRELESS WIFI LINK (iwlwifi) 3591INTEL WIRELESS WIFI LINK (iwlwifi)
3592M: Johannes Berg <johannes.berg@intel.com>
3595M: Wey-Yi Guy <wey-yi.w.guy@intel.com> 3593M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
3596M: Intel Linux Wireless <ilw@linux.intel.com> 3594M: Intel Linux Wireless <ilw@linux.intel.com>
3597L: linux-wireless@vger.kernel.org 3595L: linux-wireless@vger.kernel.org
@@ -5891,11 +5889,11 @@ F: Documentation/scsi/st.txt
5891F: drivers/scsi/st* 5889F: drivers/scsi/st*
5892 5890
5893SCTP PROTOCOL 5891SCTP PROTOCOL
5894M: Vlad Yasevich <vladislav.yasevich@hp.com> 5892M: Vlad Yasevich <vyasevich@gmail.com>
5895M: Sridhar Samudrala <sri@us.ibm.com> 5893M: Sridhar Samudrala <sri@us.ibm.com>
5896L: linux-sctp@vger.kernel.org 5894L: linux-sctp@vger.kernel.org
5897W: http://lksctp.sourceforge.net 5895W: http://lksctp.sourceforge.net
5898S: Supported 5896S: Maintained
5899F: Documentation/networking/sctp.txt 5897F: Documentation/networking/sctp.txt
5900F: include/linux/sctp.h 5898F: include/linux/sctp.h
5901F: include/net/sctp/ 5899F: include/net/sctp/
@@ -7578,8 +7576,8 @@ F: Documentation/filesystems/xfs.txt
7578F: fs/xfs/ 7576F: fs/xfs/
7579 7577
7580XILINX AXI ETHERNET DRIVER 7578XILINX AXI ETHERNET DRIVER
7581M: Ariane Keller <ariane.keller@tik.ee.ethz.ch> 7579M: Anirudha Sarangi <anirudh@xilinx.com>
7582M: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> 7580M: John Linn <John.Linn@xilinx.com>
7583S: Maintained 7581S: Maintained
7584F: drivers/net/ethernet/xilinx/xilinx_axienet* 7582F: drivers/net/ethernet/xilinx/xilinx_axienet*
7585 7583