diff options
| author | Linus Torvalds | 2019-12-09 10:59:00 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2019-12-09 10:59:00 -0800 |
| commit | 316eaf170252f3b50e0d7d5d17ac1f0ee8ae70ef (patch) | |
| tree | 346789e9dd80710a330f2b2e8ef17e2a3f2d1385 /kernel/watchdog.c | |
| parent | e42617b825f8073569da76dc4510bfa019b1c35a (diff) | |
| parent | 6e456dca47c5e3b8d8c6bbc4edd1377985d793b5 (diff) | |
Merge tag 'thermal-5.5-rc2' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions