linux/Documentation/power
Rafael J. Wysocki 93658cb859 Merge branch 'pm-cpufreq'
* pm-cpufreq: (167 commits)
  cpufreq: create per policy rwsem instead of per CPU cpu_policy_rwsem
  intel_pstate: Add Baytrail support
  intel_pstate: Refactor driver to support CPUs with different MSR layouts
  cpufreq: Implement light weight ->target_index() routine
  PM / OPP: rename header to linux/pm_opp.h
  PM / OPP: rename data structures to dev_pm equivalents
  PM / OPP: rename functions to dev_pm_opp*
  cpufreq / governor: Remove fossil comment
  cpufreq: exynos4210: Use the common clock framework to set APLL clock rate
  cpufreq: exynos4x12: Use the common clock framework to set APLL clock rate
  cpufreq: Detect spurious invocations of update_policy_cpu()
  cpufreq: pmac64: enable cpufreq on iMac G5 (iSight) model
  cpufreq: pmac64: provide cpufreq transition latency for older G5 models
  cpufreq: pmac64: speed up frequency switch
  cpufreq: highbank-cpufreq: Enable Midway/ECX-2000
  exynos-cpufreq: fix false return check from "regulator_set_voltage"
  speedstep-centrino: Remove unnecessary braces
  acpi-cpufreq: Add comment under ACPI_ADR_SPACE_SYSTEM_IO case
  cpufreq: arm-big-little: use clk_get instead of clk_get_sys
  cpufreq: exynos: Show a list of available frequencies
  ...

Conflicts:
	drivers/devfreq/exynos/exynos5_bus.c
2013-10-28 01:29:34 +01:00
..
powercap PowerCap: Documentation 2013-10-17 00:36:06 +02:00
regulator regulator: Update regulator_register() API signature in Documentation 2012-04-13 09:54:45 +01:00
00-INDEX PM / Documentation: Update docs about suspend and CPU hotplug 2011-10-22 00:22:28 +02:00
apm-acpi.txt Documentation: update broken web addresses. 2010-08-04 15:21:40 +02:00
basic-pm-debugging.txt power: Documentation: Update s2ram link 2013-08-27 10:54:52 +02:00
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 update for freeze state 2013-05-14 01:41:37 +02:00
drivers-testing.txt PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt 2010-12-24 15:02:41 +01:00
freezing-of-tasks.txt suspend: enable freeze timeout configuration through sys 2013-02-09 22:32:48 +01:00
interface.txt PM: Documentation update for freeze state 2013-05-14 01:41:37 +02:00
notifiers.txt PM / hibernate: Correct documentation 2013-05-14 01:58:43 +02:00
opp.txt PM / OPP: rename header to linux/pm_opp.h 2013-10-25 22:33:23 +02:00
pci.txt PM/PCI: Update PCI power management documentation 2010-05-18 15:01:58 -07:00
pm_qos_interface.txt PM / QoS: Update Documentation/power/pm_qos_interface.txt 2013-06-23 00:56:09 +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 PM / Runtime: Respect autosuspend when idle triggers suspend 2013-10-16 02:06:57 +02:00
s2ram.txt PM: Add sysfs attr for rechecking dev hash from PM trace 2010-10-17 01:57:50 +02:00
states.txt PM / Documentation: remove inaccurate suspend/hibernate transition lantency statement 2013-05-14 01:46:50 +02:00
suspend-and-cpuhotplug.txt PM / Documentation: suspend-and-cpuhotplug.txt: Fix typo 2012-05-05 21:52:51 +02:00
swsusp-and-swap-files.txt typo fixes 2007-10-20 01:34:40 +02:00
swsusp-dmcrypt.txt
swsusp.txt PM / Hibernate: add section for resume options 2013-08-27 10:44:52 +02:00
tricks.txt update email address 2010-07-19 10:56:54 +02:00
userland-swsusp.txt doc: fix broken references 2011-09-27 18:08:04 +02:00
video.txt Documentation: update broken web addresses. 2010-08-04 15:21:40 +02:00