From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 28 Apr 2022 14:51:24 +0000 (+0200)
Subject: Merge branch 'thermal-int340x'
X-Git-Tag: v5.18-rc5~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a12475f91b69cce067e5de905fafa893ae12c3ae;p=thirdparty%2Flinux.git

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
---

a12475f91b69cce067e5de905fafa893ae12c3ae