Linus Torvalds 433c24ed7f Merge git://git.infradead.org/battery-2.6 ... * git://git.infradead.org/battery-2.6: power_supply: Add driver for the PMU on WM831x PMICs ds2760_battery: Fix integer overflow for time_to_empty_now wm97xx_battery: Convert to dev_pm_ops wm97xx_battery: Use irq to detect charger state wm97xx_battery: Use platform_data wm97xx-core: Pass platform_data to battery ds2760_battery: implement set_charged() feature power_supply: get_by_name and set_charged functionality power_supply: EXPORT_SYMBOL cleanups ds2760_battery: add current_accum module parameter ds2760_battery: handle full_active_uAh == 0 case correctly ds2760_battery: add rated_capacity module parameter ds2760_battery: export more features ds2760_battery: delay power supply registration wm8350_power: Implement charge type property power_supply: Add a charge_type property, and use it for olpc driver olpc_battery: Add an 'error' sysfs device that displays raw errors Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"		2009-09-23 10:11:08 -07:00
..
regulator	regulator: Add some brief design documentation	2009-09-22 22:16:53 +01:00
00-INDEX	pm: remove obsolete piece of PM documentation	2008-07-24 10:47:23 -07:00
apm-acpi.txt	pm: remove obsolete piece of PM documentation	2008-07-24 10:47:23 -07:00
basic-pm-debugging.txt	PM: Suspend/hibernation debug documentation update (rev. 2)	2008-02-01 18:30:54 -05:00
devices.txt	PM: Remove bus_type suspend_late()/resume_early() V2	2009-06-12 21:32:31 +02:00
drivers-testing.txt	PM: Suspend/hibernation debug documentation update (rev. 2)	2008-02-01 18:30:54 -05:00
freezing-of-tasks.txt	freezer: do not send signals to kernel threads	2007-10-18 14:37:19 -07:00
interface.txt	PM: Rename struct pm_ops and related things	2007-10-18 14:37:18 -07:00
notifiers.txt	Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers (rev. 2)	2008-02-01 18:30:53 -05:00
pci.txt
pm_qos_interface.txt	pm_qos: spelling fixes	2008-08-05 14:33:50 -07:00
power_supply_class.txt	power_supply: Add a charge_type property, and use it for olpc driver	2009-07-02 18:14:37 +04:00
runtime_pm.txt	PM: Introduce core framework for run-time PM of I/O devices (rev. 17)	2009-08-23 00:04:44 +02:00
s2ram.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
states.txt
swsusp-and-swap-files.txt	typo fixes	2007-10-20 01:34:40 +02:00
swsusp-dmcrypt.txt
swsusp.txt	PM: documentation cleanups	2008-02-07 01:27:17 -05:00
tricks.txt
userland-swsusp.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
video_extension.txt
video.txt