diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-02 14:48:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-02 14:48:26 -0700 |
| commit | 19127af9d81f0fcecc3e54fab64b7a7f2f91a92b (patch) | |
| tree | 95f4f3746d26e177583ad125d0f9a9c78646865d /Makefile | |
| parent | 799b63a4b058c6a48dc6805daad81ba66002c48c (diff) | |
| parent | 347d7e45bd09ce09cbc30d5cea9de377eb22f55c (diff) | |
Merge tag 'hwmon-for-linus-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Two patches headed for stable:
- Fix broken output scaling in mcp3021 driver
- Fix attribute visibility in nct7802 driver
One regression:
- Fix name attribute in dell-smm-hwmon driver"
* tag 'hwmon-for-linus-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (mcp3021) Fix broken output scaling
hwmon: (nct7802) fix visibility of temp3
hwmon: (dell-smm-hwmon) Use a valid name attribute
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions