aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-15 16:56:12 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-15 16:56:12 -0700
commit8f41958bdd577731f7411c9605cfaa9db6766809 (patch)
tree424776ff9ffe3fac011634c7c8db15dee839b0bb /MAINTAINERS
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 (diff)
parentgit-battery vs git-acpi (diff)
downloadlinux-dev-8f41958bdd577731f7411c9605cfaa9db6766809.tar.xz
linux-dev-8f41958bdd577731f7411c9605cfaa9db6766809.zip
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: git-battery vs git-acpi Power supply class and drivers: remove non obligatory return statements pda_power: clean up irq, timer MAINTAINERS: Add maintainers for power supply subsystem and drivers Fixed up trivial conflict in drivers/w1/slaves/w1_ds2760.c manually
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 10 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 360eb581953b..391426977826 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2869,6 +2869,16 @@ M: george@mvista.com
L: linux-kernel@vger.kernel.org
S: Supported
+POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
+P: Anton Vorontsov
+M: cbou@mail.ru
+P: David Woodhouse
+M: dwmw2@infradead.org
+L: linux-kernel@vger.kernel.org
+L: kernel-discuss@handhelds.org
+T: git git.infradead.org/battery-2.6.git
+S: Maintained
+
POWERPC 4xx EMAC DRIVER
P: Eugene Surovegin
M: ebs@ebshome.net