Pull ec into release branch

2e856220 · Len Brown · b43035a5 · 837012ed · 2e856220 · 2e856220
Commit 2e856220 authored Jul 22, 2007 by Len Brown
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 149 additions and 104 deletions

MAINTAINERS MAINTAINERS +3 -3

drivers/acpi/ec.c drivers/acpi/ec.c +146 -101

No files found.
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -225,15 +225,15 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:	Supported

 ACPI BATTERY DRIVERS
-P:	Vladimir P. Lebedev
-M:	vladimir.p.lebedev@intel.com
+P:	Alexey Starikovskiy
+M:	astarikovskiy@suse.de
 L:	linux-acpi@vger.kernel.org
 W:	http://acpi.sourceforge.net/
 S:	Supported

 ACPI EC DRIVER
 P:	Alexey Starikovskiy
-M:	alexey.y.starikovskiy@linux.intel.com
+M:	astarikovskiy@suse.de
 L:	linux-acpi@vger.kernel.org
 W:	http://acpi.sourceforge.net/
 S:	Supported

--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c