Merge branch 'thermal-int340x'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Apr 2022 14:51:24 +0000 (16:51 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 28 Apr 2022 14:51:24 +0000 (16:51 +0200)
commita12475f91b69cce067e5de905fafa893ae12c3ae
treec37571e6bd62bcf0fe600e2bf339a4b8efda8046
parentfa1ef24ae251f7916e70b6fac94c7db3bb837426
parentd0f6cfb2bd165b0aa307750e07e03420859bd554
Merge branch 'thermal-int340x'

Merge a fix for the attr.show callback prototype in the int340x thermal
driver (Kees Cook).

* thermal-int340x:
  thermal: int340x: Fix attr.show callback prototype