From 76fe8c247844ae32453241d145b558da32f8a856 Mon Sep 17 00:00:00 2001 From: Stanislav Yakovlev Date: Sat, 24 Mar 2012 03:41:01 -0400 Subject: [PATCH] --- yaml --- r: 298474 b: refs/heads/master c: ca907a90735877ceff800d08f780f2f1b4388afa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 062f8e9c4ca1..a6e61e7893ec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e90c7e712980bf794f88f749e2a1270e4a4a116e +refs/heads/master: ca907a90735877ceff800d08f780f2f1b4388afa diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 0ddc77fe46b6..09a79f9f1d3c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3519,17 +3519,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 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