| commit | f51d4d7826d64dee2c421267c7bd44c4d52805c5 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 29 13:20:39 2016 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 29 13:20:39 2016 -0800 |
| tree | 3a5a243f143869678c4c83bf5fbb3e93f3e110f6 | |
| parent | a12883f0af7a4ccc74381395fab5912784183efe [diff] | |
| parent | 60dee3ca27b3613e6519df52d02eadf71f853859 [diff] |
Merge tag 'hwmon-for-linus-v4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon fixes from Guenter Roeck: - Use bit mask to calculate tdp limit in fam15h_power driver - Black-list Dell Studio XPS 8000 in dell-smm driver * tag 'hwmon-for-linus-v4.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (fam15h_power) Add bit masking for tdp_limit hwmon: (dell-smm) Blacklist Dell Studio XPS 8000