Merge branches 'thermal-powerclamp' and 'thermal-int340x' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 14 Feb 2022 17:52:54 +0000 (18:52 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 14 Feb 2022 17:52:54 +0000 (18:52 +0100)
commitddc592547ca4fc690026c7e70c0f8606aecfdf53
tree2d8594889868c153adbd4df33b432c0a26957135
parent414df02673474fb0aa90681e48c773b97594c2c3
parenta11cda8e2f184e35e42bbb96a27272b3c5e801d2
parent098c874e20be2a4cee3021aa9b3485ed5e1f4d5b
Merge branches 'thermal-powerclamp' and 'thermal-int340x' into linux-next

* thermal-powerclamp:
  thermal: intel_powerclamp: don't use bitmap_weight() in end_power_clamp()

* thermal-int340x:
  thermal: Replace acpi_bus_get_device()
  thermal: int340x: Check for NULL after calling kmemdup()