]> www.infradead.org Git - users/willy/xarray.git/commitdiff
projects / users / willy / xarray.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ae123e adec57c)
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)
* 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

1  2 
kernel/cpu.c patch | diff1 | diff2 | blob | history

diff --cc kernel/cpu.c
Simple merge
XArray, radix tree and IDR