diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-04 22:25:15 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-04 22:25:15 +0100 |
| commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
| tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /MAINTAINERS | |
| parent | tcp: fix a timewait refcnt race (diff) | |
| parent | iwmc3200wifi: Enable wimax core through module parameter (diff) | |
| download | linux-8f56874bd7e8bee73ed6a1cf80dcec2753616262.tar.xz linux-8f56874bd7e8bee73ed6a1cf80dcec2753616262.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cdf5ce46b38b..1186b1978b2e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2816,6 +2816,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git S: Supported F: drivers/net/wireless/iwlwifi/ +INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi) +M: Samuel Ortiz <samuel.ortiz@intel.com> +M: Zhu Yi <yi.zhu@intel.com> +M: Intel Linux Wireless <ilw@linux.intel.com> +L: linux-wireless@vger.kernel.org +S: Supported +W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi +F: drivers/net/wireless/iwmc3200wifi/ + IOC3 ETHERNET DRIVER M: Ralf Baechle <ralf@linux-mips.org> L: linux-mips@linux-mips.org |