Anton Vorontsov 9fec6060d9 Merge branch 'master' of /home/cbou/linux-2.6 ... Conflicts: drivers/power/Kconfig drivers/power/Makefile		2008-07-30 02:05:23 +04: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
devices.txt	PM: Handle device registrations during suspend/resume	2008-04-19 19:10:24 -07:00
drivers-testing.txt
freezing-of-tasks.txt
interface.txt
notifiers.txt
pci.txt
pm_qos_interface.txt	documentation: Move power-related files to Documentation/power/	2008-03-12 18:10:51 -04:00
power_supply_class.txt	power_supply: add CHARGE_COUNTER property and olpc_battery support for it	2008-05-13 12:27:11 +04:00
s2ram.txt
states.txt
swsusp-and-swap-files.txt
swsusp-dmcrypt.txt
swsusp.txt
tricks.txt
userland-swsusp.txt
video_extension.txt
video.txt