From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Dec 2019 18:59:00 +0000 (-0800)
Subject: Merge tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef;p=linux.git

Merge tag 'thermal-5.5-rc2' of git://git./linux/kernel/git/thermal/linux

Pull thermal fixes from Zhang Rui:
 "Starting from this release cycle, we have Daniel Lezcano work as the
  new thermal co-maintainer because Eduardo's email is bouncing for
  sometime and we can not reach him. We also have a new shared git tree
  so that both Daniel and I can actively working on it.

  Specifics:

   - Update MAINTAINER file for new thermal co-maintainer and new
     thermal git tree address. (Daniel Lezcano, Florian Fainelli, Zhang
     Rui)

   - Fix a Kconfig warning. (YueHaibing)"

* tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  MAINTAINERS: thermal: Change the git tree location
  MAINTAINERS: thermal: Add Daniel Lezcano as the thermal maintainer
  MAINTAINERS: thermal: Eduardo's email is bouncing
  thermal: power_allocator: Fix Kconfig warning
---

316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef