diff options
| author | Linus Torvalds | 2016-06-12 06:30:39 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2016-06-12 06:30:39 -0700 |
| commit | 57120fac12321f636c83af447a081d680c0de2e2 (patch) | |
| tree | 4b502f4f2b7e15bc012ff8b95884c32372b6687d /usr/Makefile | |
| parent | 8714f8f5fe396ca513ccaaac2304497439c181fb (diff) | |
| parent | 5a5e78cd706ce0577ed6356634a34552c866cc10 (diff) | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui:
- fix an ordering issue in cpu cooling that cooling device is
registered before it's ready (freq_table being populated).
(Lukasz Luba)
- fix a missing comment update (Caesar Wang)
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: add the note for set_trip_temp
thermal: cpu_cooling: fix improper order during initialization
Diffstat (limited to 'usr/Makefile')
0 files changed, 0 insertions, 0 deletions