diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 250f59cc9d3c..a6fcc1eb56a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2322,9 +2322,9 @@ S: Supported | |||
2322 | F: drivers/acpi/dock.c | 2322 | F: drivers/acpi/dock.c |
2323 | 2323 | ||
2324 | DOCUMENTATION | 2324 | DOCUMENTATION |
2325 | M: Randy Dunlap <rdunlap@xenotime.net> | 2325 | M: Rob Landley <rob@landley.net> |
2326 | L: linux-doc@vger.kernel.org | 2326 | L: linux-doc@vger.kernel.org |
2327 | T: quilt http://xenotime.net/kernel-doc-patches/current/ | 2327 | T: TBD |
2328 | S: Maintained | 2328 | S: Maintained |
2329 | F: Documentation/ | 2329 | F: Documentation/ |
2330 | 2330 | ||
@@ -3587,6 +3587,7 @@ S: Supported | |||
3587 | F: drivers/net/wireless/iwlegacy/ | 3587 | F: drivers/net/wireless/iwlegacy/ |
3588 | 3588 | ||
3589 | INTEL WIRELESS WIFI LINK (iwlwifi) | 3589 | INTEL WIRELESS WIFI LINK (iwlwifi) |
3590 | M: Johannes Berg <johannes.berg@intel.com> | ||
3590 | M: Wey-Yi Guy <wey-yi.w.guy@intel.com> | 3591 | M: Wey-Yi Guy <wey-yi.w.guy@intel.com> |
3591 | M: Intel Linux Wireless <ilw@linux.intel.com> | 3592 | M: Intel Linux Wireless <ilw@linux.intel.com> |
3592 | L: linux-wireless@vger.kernel.org | 3593 | L: linux-wireless@vger.kernel.org |
@@ -6466,6 +6467,7 @@ S: Odd Fixes | |||
6466 | F: drivers/staging/olpc_dcon/ | 6467 | F: drivers/staging/olpc_dcon/ |
6467 | 6468 | ||
6468 | STAGING - OZMO DEVICES USB OVER WIFI DRIVER | 6469 | STAGING - OZMO DEVICES USB OVER WIFI DRIVER |
6470 | M: Rupesh Gujare <rgujare@ozmodevices.com> | ||
6469 | M: Chris Kelly <ckelly@ozmodevices.com> | 6471 | M: Chris Kelly <ckelly@ozmodevices.com> |
6470 | S: Maintained | 6472 | S: Maintained |
6471 | F: drivers/staging/ozwpan/ | 6473 | F: drivers/staging/ozwpan/ |