From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 3 Jun 2017 15:45:03 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.14-rc1~799
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea094f3c830a67f252677aacba5d04ebcf55c4d9;p=platform%2Fkernel%2Flinux-rpi.git

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

Pull hwmon fixes from Guenter Roeck:
 "A couple of patches for the aspeed pwm fan driver"

* tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1
  hwmon: (aspeed-pwm-tacho) Call of_node_put() on a node not claimed
  hwmon: (aspeed-pwm-tacho) On read failure return -ETIMEDOUT
  hwmon: (aspeed-pwm-tacho) Select REGMAP
---

ea094f3c830a67f252677aacba5d04ebcf55c4d9