Merge tag 'hwmon-for-v5.11-take2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2020 21:24:33 +0000 (13:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Dec 2020 21:24:33 +0000 (13:24 -0800)
commit4e31dcc0a9231462f0e275544b5aebc668481a4e
tree021fdd842358d62a2eabbcf07284f9fc0b5edca7
parent347d81b68b8f7044c9ce3fefa130a736ca916176
parent0a4e668b5d52eed8026f5d717196b02b55fb2dc6
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