diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:44:05 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-18 18:44:05 +0100 |
commit | 035f10ee4e978db0a01d0f832e328b4a62f8310e (patch) | |
tree | f9c8e95958c24450c37c27b789ac84513b6c6ff1 /drivers/cpuidle | |
parent | 0a0666428680c4a68d050491d5323a2ef05e08a7 (diff) | |
parent | f2ea5e1708da1bd7cb11c2cd967071e23ec9e347 (diff) | |
download | linux-035f10ee4e978db0a01d0f832e328b4a62f8310e.tar.gz |
Merge branch 'pm-runtime'
* pm-runtime: power / PM: Eliminate CONFIG_PM_RUNTIME NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c PM: Remove the SET_PM_RUNTIME_PM_OPS() macro mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro PM / Kconfig: Replace PM_RUNTIME with PM in dependencies ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
Diffstat (limited to 'drivers/cpuidle')
0 files changed, 0 insertions, 0 deletions