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