diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-17 00:41:55 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-17 00:41:55 +0400 |
| commit | d8d326dc7ae6bec2a999d674c5babb6bf490587a (patch) | |
| tree | 0169a23e34712e4a34db9c3dd658c14a59ded5d9 /MAINTAINERS | |
| parent | fed396a585d8e1870b326f2e8e1888a72957abb8 (diff) | |
| parent | 021570e55b7152843376b9d9f60624e3e05ac054 (diff) | |
| download | linux-d8d326dc7ae6bec2a999d674c5babb6bf490587a.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-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.* |