diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-12 13:18:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-12 13:18:20 -0800 |
| commit | de34b81bc2d034c9ba8d6b276725f975e728270a (patch) | |
| tree | 58274c8d637e21ef6b84390e89d6257c06238fdb /drivers/power | |
| parent | 999f81dd1937f2a9e56ce40e98be00758668ca19 (diff) | |
| parent | 0bd52941586b3b59ab9b6e89e55b2dc9e2680de9 (diff) | |
Merge tag 'hwmon-for-linus-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- fix PCI device ID in fam15h_power driver
- fix suspend/resume behavior in pwm-fan driver
- reduce logging noise created by ibmpowernv driver
* tag 'hwmon-for-linus-v3.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (fam15h_power) Fix NB device ID for F16h M30h
hwmon: (pwm-fan) Fix suspend/resume behavior
hwmon: (ibmpowernv) Quieten when probing finds no device
Diffstat (limited to 'drivers/power')
0 files changed, 0 insertions, 0 deletions