From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Jun 2016 13:30:39 +0000 (-0700)
Subject: Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57120fac12321f636c83af447a081d680c0de2e2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'for-rc' of git://git./linux/kernel/git/rzhang/linux

Pull thermal management fixes from Zhang Rui:

 - fix an ordering issue in cpu cooling that cooling device is
   registered before it's ready (freq_table being populated).
   (Lukasz Luba)

 - fix a missing comment update (Caesar Wang)

* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  thermal: add the note for set_trip_temp
  thermal: cpu_cooling: fix improper order during initialization
---

57120fac12321f636c83af447a081d680c0de2e2