You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		12 years ago
..
regulator	regulator: Update regulator_register() API signature in Documentation	13 years ago
00-INDEX	…
apm-acpi.txt	…
basic-pm-debugging.txt	…
charger-manager.txt	charger-manager: Provide cm_notify_event function for in-kernel use	13 years ago
devices.txt	PM / Documentation: fix typos in power management description	13 years ago
drivers-testing.txt	…
freezing-of-tasks.txt	PM / Freezer / Docs: Update documentation about freezing of tasks	13 years ago
interface.txt	…
notifiers.txt	…
opp.txt	…
pci.txt	…
pm_qos_interface.txt	PM / QoS: Introduce PM QoS device flags support	12 years ago
power_supply_class.txt	power_supply: Add support for CHARGE_CONTROL_* attributes	12 years ago
runtime_pm.txt	…
s2ram.txt	…
states.txt	…
suspend-and-cpuhotplug.txt	PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo	13 years ago
swsusp-and-swap-files.txt	…
swsusp-dmcrypt.txt	…
swsusp.txt	doc: fix broken utf8 encoding	13 years ago
tricks.txt	…
userland-swsusp.txt	…
video.txt	…
video_extension.txt	…