commit ea094f3c830a67f252677aacba5d04ebcf55c4d9
author Linus Torvalds <torvalds@linux-foundation.org> Sat Jun 03 08:45:03 2017 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Jun 03 08:45:03 2017 -0700
tree 73b9c93fb2fd525ffdfd04dd4bf00b733e35dc54
parent cc54874055c007cd599138a394d1f039e4e0764b
parent 5f348fa35a28b19cf7ee1eaa420757341a724c86

Merge tag 'hwmon-for-linus-v4.12-rc4' of git://git.kernel.org/pub/scm/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