From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 16 Jul 2013 19:43:28 +0000 (+0200)
Subject: Merge branch 'pm-fixes'
X-Git-Tag: next-20130717~49^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e3aa0b9648c039132e25651e1ffb294d505165b7;p=karo-tx-linux.git

Merge branch 'pm-fixes'

* pm-fixes:
  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
---

e3aa0b9648c039132e25651e1ffb294d505165b7