OSDN Git Service

Merge tag 'hwmon-for-linus-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Jul 2015 21:48:26 +0000 (14:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Jul 2015 21:48:26 +0000 (14:48 -0700)
commit19127af9d81f0fcecc3e54fab64b7a7f2f91a92b
tree95f4f3746d26e177583ad125d0f9a9c78646865d
parent799b63a4b058c6a48dc6805daad81ba66002c48c
parent347d7e45bd09ce09cbc30d5cea9de377eb22f55c
Merge tag 'hwmon-for-linus-v4.2-rc1' of git://git./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