diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:56:12 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-15 19:56:12 -0400 |
| commit | 8f41958bdd577731f7411c9605cfaa9db6766809 (patch) | |
| tree | 424776ff9ffe3fac011634c7c8db15dee839b0bb /MAINTAINERS | |
| parent | bc06cffdec85d487c77109dffcd2f285bdc502d3 (diff) | |
| parent | 0909fca51346d0ece688532c54d41ebc986aef7f (diff) | |
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-- | MAINTAINERS | 10 |
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 | |||
| 2869 | L: linux-kernel@vger.kernel.org | 2869 | L: linux-kernel@vger.kernel.org |
| 2870 | S: Supported | 2870 | S: Supported |
| 2871 | 2871 | ||
| 2872 | POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS | ||
| 2873 | P: Anton Vorontsov | ||
| 2874 | M: cbou@mail.ru | ||
| 2875 | P: David Woodhouse | ||
| 2876 | M: dwmw2@infradead.org | ||
| 2877 | L: linux-kernel@vger.kernel.org | ||
| 2878 | L: kernel-discuss@handhelds.org | ||
| 2879 | T: git git.infradead.org/battery-2.6.git | ||
| 2880 | S: Maintained | ||
| 2881 | |||
| 2872 | POWERPC 4xx EMAC DRIVER | 2882 | POWERPC 4xx EMAC DRIVER |
| 2873 | P: Eugene Surovegin | 2883 | P: Eugene Surovegin |
| 2874 | M: ebs@ebshome.net | 2884 | M: ebs@ebshome.net |