diff --git a/[refs] b/[refs] index 8da7b2fd1508..1e49b55d08f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fbae2c21446daf7fdae00f513b49350e4242bad +refs/heads/master: 8893bd03f8b412db59b397266e2b586e361e80a8 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 840a4104ca0e..b7d0fee4dc1c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4065,12 +4065,6 @@ F: Documentation/networking/ixgbe.txt F: Documentation/networking/ixgbevf.txt F: drivers/net/ethernet/intel/ -INTEL MRST PMU DRIVER -M: Len Brown -L: linux-pm@vger.kernel.org -S: Supported -F: arch/x86/platform/mrst/pmu.* - INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT M: Stanislav Yakovlev L: linux-wireless@vger.kernel.org