diff --git a/[refs] b/[refs] index 49480df00ba8..caafad0dbd5b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4084c147bd06ecc13d787eec626ff1faf8f5851 +refs/heads/master: 3a2468d0274d10916baf5318f9004a8061533370 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7679bf32f7bb..b5e4c9f303f6 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -241,21 +241,6 @@ F: drivers/pnp/pnpacpi/ F: include/linux/acpi.h F: include/acpi/ -ACPI BATTERY DRIVERS -M: Alexey Starikovskiy -L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ -S: Supported -F: drivers/acpi/battery.c -F: drivers/acpi/*sbs* - -ACPI EC DRIVER -M: Alexey Starikovskiy -L: linux-acpi@vger.kernel.org -W: http://www.lesswatts.org/projects/acpi/ -S: Supported -F: drivers/acpi/ec.c - ACPI FAN DRIVER M: Zhang Rui L: linux-acpi@vger.kernel.org