From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 7 Oct 2017 00:59:32 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.15~10269
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c86f2e4c84faface399d7ba7c740423d6dfbdf9;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'hwmon-for-linus-v4.14-rc4' of git://git./linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix up error path in xgene driver"

* tag 'hwmon-for-linus-v4.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (xgene) Fix up error handling path mixup in 'xgene_hwmon_probe()'
---

1c86f2e4c84faface399d7ba7c740423d6dfbdf9