diff options
| author | Linus Torvalds | 2013-11-22 10:49:14 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2013-11-22 10:49:14 -0800 |
| commit | 0032cdefff0f4ff5bd9464036d510a5441ec8b83 (patch) | |
| tree | b76effcbf3b21b19db94d7efd6ae35c85d8dba6b /drivers/infiniband | |
| parent | d2c2ad54c485e7ebca5c0b7e4a7b2c56103fda38 (diff) | |
| parent | 3a4cbc190643d0c6f7ca36a84af8367947f558c7 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- acpi_power_meter: Fix return value check from call to
acpi_bus_get_device
- nct6775: Fix/improve NCT6791 support
- lm75: Add support for GMT G751
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (acpi_power_meter) Fix acpi_bus_get_device() return value check
hwmon: (nct6775) NCT6791 supports weight control only for CPUFAN
hwmon: (nct6775) Monitor additional temperature registers
hwmon: (lm75) Add support for GMT G751 chip
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions