projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 71893f1 b907b40)
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)
commitba2b137d10bafc3cc514e52172b549e64a5402fb
tree1f57795b7555cc19e1453247e5e4bd27aa185a76tree | snapshot
parent71893f116109c92e4cd230d990fad5bd7cb4f99dcommit | diff
parentb907b408ca64482989cd95dacef804ce509a3673commit | diff
Merge branch 'next' of git://git./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()
John Crispins staging tree