From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jul 2013 19:47:00 +0000 (+0200)
Subject: Merge branch 'pm-fixes'
X-Git-Tag: v3.11-rc2~13^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5a8d2815593007d4eb59f337ef919c871c2649ab;p=~emulex%2Finfiniband.git

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
---

5a8d2815593007d4eb59f337ef919c871c2649ab