linux/Documentation/power
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
regulator doc: fix regulator docs cut-and-pasteism 2009-12-04 15:39:58 +01:00
00-INDEX
apm-acpi.txt
basic-pm-debugging.txt
devices.txt PM: Remove bus_type suspend_late()/resume_early() V2 2009-06-12 21:32:31 +02:00
drivers-testing.txt
freezing-of-tasks.txt
interface.txt
notifiers.txt
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 Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
s2ram.txt trivial: Miscellaneous documentation typo fixes 2009-06-12 18:01:47 +02:00
states.txt
swsusp-and-swap-files.txt
swsusp-dmcrypt.txt
swsusp.txt
tricks.txt
userland-swsusp.txt trivial: Miscellaneous documentation typo fixes 2009-06-12 18:01:47 +02:00
video.txt
video_extension.txt