| commit | 8f41958bdd577731f7411c9605cfaa9db6766809 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Jul 15 16:56:12 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Sun Jul 15 16:56:12 2007 -0700 |
| tree | 424776ff9ffe3fac011634c7c8db15dee839b0bb | |
| 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