]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3fb74e4 124eb1c)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2018 23:52:26 +0000 (16:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Apr 2018 23:52:26 +0000 (16:52 -0700)
commite819f87e825dc99682b65d6699f87f7cb2cd0f82
tree1f57795b7555cc19e1453247e5e4bd27aa185a76tree | snapshot
parent3fb74e44b70cb2828d5cbab99cd2154f3959d701commit | diff
parent124eb1cd9da92b2f548d549ee964ee80b44a3617commit | diff
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

Pull thermal management update from Zhang Rui:

 - Fix race condition in imx_thermal_probe() (Mikhail Lappo)

 - Add cooling device's statistics in sysfs (Viresh Kumar)

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: Add cooling device's statistics in sysfs
  thermal: imx: Fix race condition in imx_thermal_probe()
Linux Kernel Source Tree.