diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-25 12:49:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-25 12:49:38 +0300 |
| commit | 61c04572de404e52a655a36752e696bbcb483cf5 (patch) | |
| tree | 48e3f1e1594d96910a41815f20653a6a1163282d /drivers/pci/msi.c | |
| parent | 4935e04ef431c7980ba6e8145ad4c697abccf6b9 (diff) | |
| parent | 829bc78aa7628e81a9de717316b85cbee3c5eb86 (diff) | |
| download | linux-61c04572de404e52a655a36752e696bbcb483cf5.tar.xz | |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fixes from Zhang Rui:
- Fix cpu_cooling to have separate thermal_cooling_device_ops
structures for cpus with and without power model, to avoid NULL
dereference in cpufreq_state2power. From Brendan Jackman.
- Fix a possible NULL dereference in imx_thermal driver. From Corentin
LABBE.
- Another two trivial fixes, one typo fix and one deleting module
owner. From Caesar Wang and Markus Elfring.
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: imx: fix a possible NULL dereference
thermal: trivial: fix the typo
Thermal-INT3406: Delete owner assignment
thermal: cpu_cooling: Fix NULL dereference in cpufreq_state2power
Diffstat (limited to 'drivers/pci/msi.c')
0 files changed, 0 insertions, 0 deletions