From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 22 Dec 2016 13:34:55 +0000 (+0100)
Subject: Merge branch 'pm-cpufreq'
X-Git-Tag: Ubuntu-5.0.0-8.9~5791^2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=7b99f1aeed37196ad54099c30c2f154a7d6e91e0;p=mirror_ubuntu-disco-kernel.git

Merge branch 'pm-cpufreq'

* pm-cpufreq:
  cpufreq: s3c64xx: remove incorrect __init annotation
  cpufreq: Remove CPU hotplug callbacks only if they were initialized
  CPU/hotplug: Clarify description of __cpuhp_setup_state() return value
---

7b99f1aeed37196ad54099c30c2f154a7d6e91e0