tree 1bfbceb13c90b45bf0274f5430dcdbeea64427ff
parent fc0ad6c7bb8c331bb0f20259d82e81318b0053be
parent e8d05276f236ee6435e78411f62be9714e0b9377
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1374176820 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1374176820 +0200

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