diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-03 08:45:03 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-03 08:45:03 -0700 |
commit | ea094f3c830a67f252677aacba5d04ebcf55c4d9 (patch) | |
tree | 73b9c93fb2fd525ffdfd04dd4bf00b733e35dc54 /drivers/infiniband/core/core_priv.h | |
parent | Merge tag 'for-linus-20170602' of git://git.infradead.org/linux-mtd (diff) | |
parent | hwmon: (aspeed-pwm-tacho) make fan/pwm names start with index 1 (diff) | |
download | linux-dev-ea094f3c830a67f252677aacba5d04ebcf55c4d9.tar.xz linux-dev-ea094f3c830a67f252677aacba5d04ebcf55c4d9.zip |
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
Diffstat (limited to 'drivers/infiniband/core/core_priv.h')
0 files changed, 0 insertions, 0 deletions