diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-01 16:47:08 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-01 16:47:08 -0400 |
| commit | 54f5ffbf308828b588b9d1acd9a512d433be8a09 (patch) | |
| tree | 02746522e57bd0c92432a17d53ba40666cd41ced /MAINTAINERS | |
| parent | 1d24fb3684f347226747c6b11ea426b7b992694e (diff) | |
| parent | de312db345f9770b64ff39ef5a7f86f6358e93cc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3adbbb294bad..cae7438d963e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3553,17 +3553,13 @@ L: linux-pm@vger.kernel.org S: Supported F: arch/x86/platform/mrst/pmu.* -INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT +INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT +M: Stanislav Yakovlev <stas.yakovlev@gmail.com> L: linux-wireless@vger.kernel.org -S: Orphan +S: Maintained F: Documentation/networking/README.ipw2100 -F: drivers/net/wireless/ipw2x00/ipw2100.* - -INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT -L: linux-wireless@vger.kernel.org -S: Orphan F: Documentation/networking/README.ipw2200 -F: drivers/net/wireless/ipw2x00/ipw2200.* +F: drivers/net/wireless/ipw2x00/ INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT) M: Joseph Cihula <joseph.cihula@intel.com> |