diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-17 14:19:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-17 14:19:06 -0700 |
| commit | bb9c03d8a6893517737b16fdbeb54be3c73b3023 (patch) | |
| tree | 35fa0d1defaaf94641963a49126d7bb475ffa4c6 /MAINTAINERS | |
| parent | 4de57826810fd2cfeb2ab5c7d003ff9116b8f7ee (diff) | |
| parent | abf52f86aa0a49a7377350cafa8f218c4cd227e7 (diff) | |
| download | lwn-bb9c03d8a6893517737b16fdbeb54be3c73b3023.tar.gz lwn-bb9c03d8a6893517737b16fdbeb54be3c73b3023.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 | 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/ F: drivers/net/ixgbe/ INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT -M: Reinette Chatre <reinette.chatre@intel.com> -M: Intel Linux Wireless <ilw@linux.intel.com> L: linux-wireless@vger.kernel.org -W: http://ipw2100.sourceforge.net -S: Odd Fixes +S: Orphan F: Documentation/networking/README.ipw2100 F: drivers/net/wireless/ipw2x00/ipw2100.* INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT -M: Reinette Chatre <reinette.chatre@intel.com> -M: Intel Linux Wireless <ilw@linux.intel.com> L: linux-wireless@vger.kernel.org -W: http://ipw2200.sourceforge.net -S: Odd Fixes +S: Orphan F: Documentation/networking/README.ipw2200 F: drivers/net/wireless/ipw2x00/ipw2200.* |