From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 18 Dec 2020 20:19:37 +0000 (-0800)
Subject: Merge tag 'thermal-v5.11-2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.11-rc1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=432c19a8d965aa0123e0a81492492a7cb1da5257;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'thermal-v5.11-2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Pull thermal fixlet from Daniel Lezcano:
 "A trivial change which fell through the cracks:

  Add Alder Lake support ACPI ids (Srinivas Pandruvada)"

* tag 'thermal-v5.11-2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal: int340x: Support Alder Lake
---

432c19a8d965aa0123e0a81492492a7cb1da5257