diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
| commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
| tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /MAINTAINERS | |
| parent | 47e1c323069bcef0acb8a2b48921688573f5ca63 (diff) | |
| parent | 159bcfeb9123c91f0dc885a42b6387a98192f896 (diff) | |
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 | |||
| 2816 | S: Supported | 2816 | S: Supported |
| 2817 | F: drivers/net/wireless/iwlwifi/ | 2817 | F: drivers/net/wireless/iwlwifi/ |
| 2818 | 2818 | ||
| 2819 | INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi) | ||
| 2820 | M: Samuel Ortiz <samuel.ortiz@intel.com> | ||
| 2821 | M: Zhu Yi <yi.zhu@intel.com> | ||
| 2822 | M: Intel Linux Wireless <ilw@linux.intel.com> | ||
| 2823 | L: linux-wireless@vger.kernel.org | ||
| 2824 | S: Supported | ||
| 2825 | W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi | ||
| 2826 | F: drivers/net/wireless/iwmc3200wifi/ | ||
| 2827 | |||
| 2819 | IOC3 ETHERNET DRIVER | 2828 | IOC3 ETHERNET DRIVER |
| 2820 | M: Ralf Baechle <ralf@linux-mips.org> | 2829 | M: Ralf Baechle <ralf@linux-mips.org> |
| 2821 | L: linux-mips@linux-mips.org | 2830 | L: linux-mips@linux-mips.org |