diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-17 17:19:06 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-17 17:19:06 -0400 |
| commit | bb9c03d8a6893517737b16fdbeb54be3c73b3023 (patch) | |
| tree | 35fa0d1defaaf94641963a49126d7bb475ffa4c6 /MAINTAINERS | |
| parent | 4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee (diff) | |
| parent | abf52f86aa0a49a7377350cafa8f218c4cd227e7 (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 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0924a76da873..2ebb56710f4d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2978,20 +2978,14 @@ F: drivers/net/ixgb/ | |||
| 2978 | F: drivers/net/ixgbe/ | 2978 | F: drivers/net/ixgbe/ |
| 2979 | 2979 | ||
| 2980 | INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT | 2980 | INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT |
| 2981 | M: Reinette Chatre <reinette.chatre@intel.com> | ||
| 2982 | M: Intel Linux Wireless <ilw@linux.intel.com> | ||
| 2983 | L: linux-wireless@vger.kernel.org | 2981 | L: linux-wireless@vger.kernel.org |
| 2984 | W: http://ipw2100.sourceforge.net | 2982 | S: Orphan |
| 2985 | S: Odd Fixes | ||
| 2986 | F: Documentation/networking/README.ipw2100 | 2983 | F: Documentation/networking/README.ipw2100 |
| 2987 | F: drivers/net/wireless/ipw2x00/ipw2100.* | 2984 | F: drivers/net/wireless/ipw2x00/ipw2100.* |
| 2988 | 2985 | ||
| 2989 | INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT | 2986 | INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT |
| 2990 | M: Reinette Chatre <reinette.chatre@intel.com> | ||
| 2991 | M: Intel Linux Wireless <ilw@linux.intel.com> | ||
| 2992 | L: linux-wireless@vger.kernel.org | 2987 | L: linux-wireless@vger.kernel.org |
| 2993 | W: http://ipw2200.sourceforge.net | 2988 | S: Orphan |
| 2994 | S: Odd Fixes | ||
| 2995 | F: Documentation/networking/README.ipw2200 | 2989 | F: Documentation/networking/README.ipw2200 |
| 2996 | F: drivers/net/wireless/ipw2x00/ipw2200.* | 2990 | F: drivers/net/wireless/ipw2x00/ipw2200.* |
| 2997 | 2991 | ||