Anton Vorontsov 76d8a23b12 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux ... The merge is merely to fix conflicts before sending a pull request. Conflicts: drivers/power/ab8500_btemp.c drivers/power/ab8500_charger.c drivers/power/ab8500_fg.c drivers/power/abx500_chargalg.c drivers/power/max8925_power.c Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>		2012-12-11 22:15:57 -08:00
..
regulator
00-INDEX
apm-acpi.txt
basic-pm-debugging.txt
charger-manager.txt	charger-manager: Provide cm_notify_event function for in-kernel use	2012-05-05 19:51:58 -07:00
devices.txt	PM / Documentation: fix typos in power management description	2012-07-03 18:32:51 +02:00
drivers-testing.txt
freezing-of-tasks.txt
interface.txt
notifiers.txt
opp.txt
pci.txt
pm_qos_interface.txt	PM / QoS: Introduce PM QoS device flags support	2012-10-23 01:09:12 +02:00
power_supply_class.txt	power_supply: Add support for CHARGE_CONTROL_* attributes	2012-11-17 20:21:43 -08:00
runtime_pm.txt
s2ram.txt
states.txt
suspend-and-cpuhotplug.txt
swsusp-and-swap-files.txt
swsusp-dmcrypt.txt
swsusp.txt	doc: fix broken utf8 encoding	2012-09-01 10:24:06 -07:00
tricks.txt
userland-swsusp.txt
video.txt
video_extension.txt