From: Linus Torvalds Date: Sun, 15 Jul 2007 23:56:12 +0000 (-0700) Subject: Merge git://git.infradead.org/battery-2.6 X-Git-Tag: v2.6.23-rc1~1052 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8f41958bdd577731f7411c9605cfaa9db6766809;p=linux-2.6-omap-h63xx.git 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 --- 8f41958bdd577731f7411c9605cfaa9db6766809