]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commit
Merge tag 'thermal-v5.11-2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Dec 2020 20:19:37 +0000 (12:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Dec 2020 20:19:37 +0000 (12:19 -0800)
commit432c19a8d965aa0123e0a81492492a7cb1da5257
tree184f91715d30329bb498ac5c3bc7f41211cc2a35
parenta087241716a6cea8518ca33839276a9648d91cef
parent67698880ac9d56367ebf22f8336ccab6234f9feb
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