From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 22 Dec 2016 18:15:05 +0000 (-0800)
Subject: Merge tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=85ba70b6ceff7a2880f29b94e789cee436bc572f;p=linux-beck.git

Merge tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fixes from Rafael Wysocki:
 "They fix one bug introduced recently, a build warning and a kerneldoc
  function description.

  Specifics:

   - Prevent the acpi-cpufreq driver from crashing on exit by fixing a
     check against the __cpuhp_setup_state() return value and fix the
     kerneldoc description of that function to make it clear that it may
     return positive numbers on success too (Boris Ostrovsky)

   - Drop an incorrect __init annotation of a function in the s3c64xx
     cpufreq driver and fix a build warning generated (by older
     compilers) because of it (Arnd Bergmann)"

* tag 'pm-fixes-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  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
---

85ba70b6ceff7a2880f29b94e789cee436bc572f