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> |
||
---|---|---|
.. | ||
regulator | ||
00-INDEX | ||
apm-acpi.txt | ||
basic-pm-debugging.txt | ||
charger-manager.txt | ||
devices.txt | ||
drivers-testing.txt | ||
freezing-of-tasks.txt | ||
interface.txt | ||
notifiers.txt | ||
opp.txt | ||
pci.txt | ||
pm_qos_interface.txt | ||
power_supply_class.txt | ||
runtime_pm.txt | ||
s2ram.txt | ||
states.txt | ||
suspend-and-cpuhotplug.txt | ||
swsusp-and-swap-files.txt | ||
swsusp-dmcrypt.txt | ||
swsusp.txt | ||
tricks.txt | ||
userland-swsusp.txt | ||
video.txt | ||
video_extension.txt |