diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-18 19:43:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-18 19:43:29 +0300 |
| commit | 0d77a123ffb5d11b97895afe8430191a273b23d6 (patch) | |
| tree | d6b81e25324c773136b77e42590674f2016779f6 /arch/s390/include/uapi/asm/unistd.h | |
| parent | 7f151f1d8abb7d5930b49d4796b463dca1673cb7 (diff) | |
| parent | cef03d7e66bd70c4baf61dd2431cf8de250834de (diff) | |
| download | linux-0d77a123ffb5d11b97895afe8430191a273b23d6.tar.xz | |
Merge tag 'hwmon-for-linus-v4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Fix build issues in scpi and ina2xx drivers, update scpi driver to
support recent firmware, and fix an uninitialized variable warning in
applesmc driver"
* tag 'hwmon-for-linus-v4.4-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (scpi) skip unsupported sensors properly
hwmon: (scpi) add thermal-of dependency
hwmon : (applesmc) Fix uninitialized variables warnings
hwmon: (ina2xx) Fix build issue by selecting REGMAP_I2C
Diffstat (limited to 'arch/s390/include/uapi/asm/unistd.h')
0 files changed, 0 insertions, 0 deletions