diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-22 13:53:01 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-22 13:53:01 -0800 |
| commit | 23400ac997062647f2b63c82030d189671b1effe (patch) | |
| tree | 176717593ab7752d3cf21c41aa186505856c3c0b /include | |
| parent | b66c08ba28aa1f81eb06a1127aa3936ff77e5e2c (diff) | |
| parent | ec638db8cb9ddd5ca08b23f2835b6c9c15eb616d (diff) | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fix from Zhang Rui:
"We only have one urgent fix this time.
Commit 3105f234e0ab ("thermal/powerclamp: correct cpu support check"),
which is shipped in 4.9-rc3, fixed a problem introduced by commit
b721ca0d1927 ("thermal/powerclamp: remove cpu whitelist").
But unfortunately, it broke intel_powerclamp driver module auto-
loading at the same time. Thus we need this change to add back module
auto-loading for 4.9"
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal/powerclamp: add back module device table
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions