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 75f771c8579f..4a5d67620a51 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1150,7 +1150,6 @@ F: include/net/ax25.h | |||
1150 | F: net/ax25/ | 1150 | F: net/ax25/ |
1151 | 1151 | ||
1152 | B43 WIRELESS DRIVER | 1152 | B43 WIRELESS DRIVER |
1153 | M: Michael Buesch <mb@bu3sch.de> | ||
1154 | M: Stefano Brivio <stefano.brivio@polimi.it> | 1153 | M: Stefano Brivio <stefano.brivio@polimi.it> |
1155 | L: linux-wireless@vger.kernel.org | 1154 | L: linux-wireless@vger.kernel.org |
1156 | W: http://linuxwireless.org/en/users/Drivers/b43 | 1155 | W: http://linuxwireless.org/en/users/Drivers/b43 |
@@ -2847,6 +2846,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git | |||
2847 | S: Supported | 2846 | S: Supported |
2848 | F: drivers/net/wireless/iwlwifi/ | 2847 | F: drivers/net/wireless/iwlwifi/ |
2849 | 2848 | ||
2849 | INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi) | ||
2850 | M: Samuel Ortiz <samuel.ortiz@intel.com> | ||
2851 | M: Zhu Yi <yi.zhu@intel.com> | ||
2852 | M: Intel Linux Wireless <ilw@linux.intel.com> | ||
2853 | L: linux-wireless@vger.kernel.org | ||
2854 | S: Supported | ||
2855 | W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi | ||
2856 | F: drivers/net/wireless/iwmc3200wifi/ | ||
2857 | |||
2850 | IOC3 ETHERNET DRIVER | 2858 | IOC3 ETHERNET DRIVER |
2851 | M: Ralf Baechle <ralf@linux-mips.org> | 2859 | M: Ralf Baechle <ralf@linux-mips.org> |
2852 | L: linux-mips@linux-mips.org | 2860 | L: linux-mips@linux-mips.org |
@@ -3771,9 +3779,9 @@ F: include/linux/if_* | |||
3771 | F: include/linux/*device.h | 3779 | F: include/linux/*device.h |
3772 | 3780 | ||
3773 | NETXEN (1/10) GbE SUPPORT | 3781 | NETXEN (1/10) GbE SUPPORT |
3774 | M: Dhananjay Phadke <dhananjay@netxen.com> | 3782 | M: Amit Kumar Salecha <amit.salecha@qlogic.com> |
3775 | L: netdev@vger.kernel.org | 3783 | L: netdev@vger.kernel.org |
3776 | W: http://www.netxen.com | 3784 | W: http://www.qlogic.com |
3777 | S: Supported | 3785 | S: Supported |
3778 | F: drivers/net/netxen/ | 3786 | F: drivers/net/netxen/ |
3779 | 3787 | ||