summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-04-04 16:10:36 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-04-04 16:10:36 -0400
commit18d6a0f5b6693d630a8da9dfd6cac1ea4e5dccab (patch)
treefe8405c00398b6b74d76c7dec61196732a4e33b1 /MAINTAINERS
parent83860c594f65945b1a2c99e84338e1145cd34890 (diff)
parent7eaa6a5e964f1ab02d849bda36950c0d30be8ce2 (diff)
Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6b4b9cdec370..09d3fc0fbbeb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3355,6 +3355,16 @@ F: Documentation/wimax/README.i2400m
F: drivers/net/wimax/i2400m/
F: include/linux/wimax/i2400m.h
+INTEL PRO/WIRELESS 3945ABG/BG NETWORK CONNECTION SUPPORT
+L: linux-wireless@vger.kernel.org
+S: Orphan
+F: drivers/net/wireless/iwlegacy/
+
+INTEL WIRELESS WIFI 4965AGN NETWORK CONNECTION SUPPORT
+L: linux-wireless@vger.kernel.org
+S: Orphan
+F: drivers/net/wireless/iwlegacy/
+
INTEL WIRELESS WIFI LINK (iwlwifi)
M: Wey-Yi Guy <wey-yi.w.guy@intel.com>
M: Intel Linux Wireless <ilw@linux.intel.com>