diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-12 10:58:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-12 10:58:57 -0700 |
| commit | 427fbe89261d8f11cd20b5a4ba94e977061f69d6 (patch) | |
| tree | 2372e38929f4de3d900fd843d133e24c346e2f96 /fs | |
| parent | 0d4cafd12f4c67a3cce83fd0dd2e416080900615 (diff) | |
| parent | 60abce9f43d812dfec6687a10ca30be380f6f97a (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fixes from Zhang Rui:
- fix NULL pointer dereference on module load/probe for int3403_thermal
driver
- fix an emergency shutdown issue on exynos thermal driver
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: exynos: Propagate error value from tmu_read()
thermal: exynos: Reading temperature makes sense only when TMU is turned on
thermal: int3403_thermal: Fix NULL pointer deref on module load / probe
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions