]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge branch 'pm-fixes'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jul 2013 19:47:00 +0000 (21:47 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jul 2013 19:47:00 +0000 (21:47 +0200)
* pm-fixes:
  cpufreq: Revert commit 369285e1 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


Trivial merge