Merge branch 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 22 Dec 2016 13:34:55 +0000 (14:34 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 22 Dec 2016 13:34:55 +0000 (14:34 +0100)
commit7b99f1aeed37196ad54099c30c2f154a7d6e91e0
tree6c19dc46f3157e9988ab9bb65acade116801babc
parent7ae123edd37a47e178eb9a6631fe4a7108262c10
parentadec57c61c2421d9d06c1fa8dd1ff7ed4fd2ca1b
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
kernel/cpu.c