diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 09:34:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 09:34:20 -0800 |
| commit | 561a60f025f7b173830c4a2d51f5725bd2094ddf (patch) | |
| tree | bc614bc6f54979ba21f534a6df3d4a44fb6d881a /scripts | |
| parent | Merge tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (diff) | |
| parent | hwmon: (k10temp) Add support for Kaveri CPUs (diff) | |
| download | linux-dev-561a60f025f7b173830c4a2d51f5725bd2094ddf.tar.xz linux-dev-561a60f025f7b173830c4a2d51f5725bd2094ddf.zip | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"Add support for Kaveri CPUs to k10temp driver. Add support for S12x0
to coretemp driver.
Cleanup and minor fixes in several drivers. Notable are 'Do not
return -EAGAIN for low temperatures' to coretemp and 'Re-enable
logical device mapping for NCT6791 during resume' to nct6775. Both
will be sent to -stable, but only after some time in mainline"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (k10temp) Add support for Kaveri CPUs
hwmon: (sht15) add include guard
hwmon: (max197) add include guard
hwmon: (nct6775) Re-enable logical device mapping for NCT6791 during resume
hwmon: (s3c) Trivial cleanup in hwmon-s3c.h
hwmon: (coretemp) Do not return -EAGAIN for low temperatures
hwmon: (da9052) Fix adc to voltage calculation
hwmon: (coretemp) Refine TjMax detection
hwmon: (coretemp) Add PCI device ID for CE41x0 CPUs
hwmon: (coretemp) Use PCI host bridge ID to identify CPU if necessary
hwmon: remove DEFINE_PCI_DEVICE_TABLE macro
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions