From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Dec 2020 21:24:33 +0000 (-0800)
Subject: Merge tag 'hwmon-for-v5.11-take2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~2092
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e31dcc0a9231462f0e275544b5aebc668481a4e;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'hwmon-for-v5.11-take2' of git://git./linux/kernel/git/groeck/linux-staging

Pull another hwmon update from Guenter Roeck:
 "The only patch in this series is removal of voltage and current
  reporting for AMD Zen CPUs.

  Turns out that was not worth the trouble, because it's all
  undocumented and not maintainable"

* tag 'hwmon-for-v5.11-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (k10temp) Remove support for displaying voltage and current on Zen CPUs
---

4e31dcc0a9231462f0e275544b5aebc668481a4e