]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 May 2018 17:58:57 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 12 May 2018 17:58:57 +0000 (10:58 -0700)
commit427fbe89261d8f11cd20b5a4ba94e977061f69d6
tree2372e38929f4de3d900fd843d133e24c346e2f96
parent0d4cafd12f4c67a3cce83fd0dd2e416080900615
parent60abce9f43d812dfec6687a10ca30be380f6f97a
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