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: baikal/mips/sdk6.1~5902^2
X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=32e3925091b1b595adfff799c049b410f88384a8;p=kernel.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
---

32e3925091b1b595adfff799c049b410f88384a8