diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4f96ac81089c..89ceb4005c5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1120,7 +1120,6 @@ F: include/net/ax25.h | |||
1120 | F: net/ax25/ | 1120 | F: net/ax25/ |
1121 | 1121 | ||
1122 | B43 WIRELESS DRIVER | 1122 | B43 WIRELESS DRIVER |
1123 | M: Michael Buesch <mb@bu3sch.de> | ||
1124 | M: Stefano Brivio <stefano.brivio@polimi.it> | 1123 | M: Stefano Brivio <stefano.brivio@polimi.it> |
1125 | L: linux-wireless@vger.kernel.org | 1124 | L: linux-wireless@vger.kernel.org |
1126 | W: http://linuxwireless.org/en/users/Drivers/b43 | 1125 | W: http://linuxwireless.org/en/users/Drivers/b43 |
@@ -2817,6 +2816,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git | |||
2817 | S: Supported | 2816 | S: Supported |
2818 | F: drivers/net/wireless/iwlwifi/ | 2817 | F: drivers/net/wireless/iwlwifi/ |
2819 | 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 | |||
2820 | IOC3 ETHERNET DRIVER | 2828 | IOC3 ETHERNET DRIVER |
2821 | M: Ralf Baechle <ralf@linux-mips.org> | 2829 | M: Ralf Baechle <ralf@linux-mips.org> |
2822 | L: linux-mips@linux-mips.org | 2830 | L: linux-mips@linux-mips.org |
@@ -3741,9 +3749,9 @@ F: include/linux/if_* | |||
3741 | F: include/linux/*device.h | 3749 | F: include/linux/*device.h |
3742 | 3750 | ||
3743 | NETXEN (1/10) GbE SUPPORT | 3751 | NETXEN (1/10) GbE SUPPORT |
3744 | M: Dhananjay Phadke <dhananjay@netxen.com> | 3752 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> |
3745 | L: netdev@vger.kernel.org | 3753 | L: netdev@vger.kernel.org |
3746 | W: http://www.netxen.com | 3754 | W: http://www.qlogic.com |
3747 | S: Supported | 3755 | S: Supported |
3748 | F: drivers/net/netxen/ | 3756 | F: drivers/net/netxen/ |
3749 | 3757 | ||