diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-18 21:47:00 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-07-18 21:47:00 +0200 |
commit | 5a8d2815593007d4eb59f337ef919c871c2649ab (patch) | |
tree | 1bfbceb13c90b45bf0274f5430dcdbeea64427ff /arch/x86 | |
parent | fc0ad6c7bb8c331bb0f20259d82e81318b0053be (diff) | |
parent | e8d05276f236ee6435e78411f62be9714e0b9377 (diff) | |
download | blackbird-op-linux-5a8d2815593007d4eb59f337ef919c871c2649ab.tar.gz blackbird-op-linux-5a8d2815593007d4eb59f337ef919c871c2649ab.zip |
Merge branch 'pm-fixes'
* pm-fixes:
cpufreq: Revert commit 2f7021a8 to fix CPU hotplug regression
cpufreq: s3c24xx: fix "depends on ARM_S3C24XX" in Kconfig
cpufreq: s3c24xx: rename CONFIG_CPU_FREQ_S3C24XX_DEBUGFS
PM / Sleep: Fix comment typo in pm_wakeup.h
PM / Sleep: avoid 'autosleep' in shutdown progress
cpufreq: Revert commit a66b2e to fix suspend/resume regression
Diffstat (limited to 'arch/x86')
0 files changed, 0 insertions, 0 deletions