aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 5 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index b0f1073c40b0..bb76fc42fc42 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2321,9 +2321,9 @@ S: Supported
2321F: drivers/acpi/dock.c 2321F: drivers/acpi/dock.c
2322 2322
2323DOCUMENTATION 2323DOCUMENTATION
2324M: Randy Dunlap <rdunlap@xenotime.net> 2324M: Rob Landley <rob@landley.net>
2325L: linux-doc@vger.kernel.org 2325L: linux-doc@vger.kernel.org
2326T: quilt http://xenotime.net/kernel-doc-patches/current/ 2326T: TBD
2327S: Maintained 2327S: Maintained
2328F: Documentation/ 2328F: Documentation/
2329 2329
@@ -3592,6 +3592,7 @@ S: Supported
3592F: drivers/net/wireless/iwlegacy/ 3592F: drivers/net/wireless/iwlegacy/
3593 3593
3594INTEL WIRELESS WIFI LINK (iwlwifi) 3594INTEL WIRELESS WIFI LINK (iwlwifi)
3595M: Johannes Berg <johannes.berg@intel.com>
3595M: Wey-Yi Guy <wey-yi.w.guy@intel.com> 3596M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
3596M: Intel Linux Wireless <ilw@linux.intel.com> 3597M: Intel Linux Wireless <ilw@linux.intel.com>
3597L: linux-wireless@vger.kernel.org 3598L: linux-wireless@vger.kernel.org
@@ -7578,8 +7579,8 @@ F: Documentation/filesystems/xfs.txt
7578F: fs/xfs/ 7579F: fs/xfs/
7579 7580
7580XILINX AXI ETHERNET DRIVER 7581XILINX AXI ETHERNET DRIVER
7581M: Ariane Keller <ariane.keller@tik.ee.ethz.ch> 7582M: Anirudha Sarangi <anirudh@xilinx.com>
7582M: Daniel Borkmann <daniel.borkmann@tik.ee.ethz.ch> 7583M: John Linn <John.Linn@xilinx.com>
7583S: Maintained 7584S: Maintained
7584F: drivers/net/ethernet/xilinx/xilinx_axienet* 7585F: drivers/net/ethernet/xilinx/xilinx_axienet*
7585 7586