From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Apr 2018 23:52:26 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ba2b137d10bafc3cc514e52172b549e64a5402fb;p=openwrt%2Fstaging%2Fblogic.git

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()
---

ba2b137d10bafc3cc514e52172b549e64a5402fb