diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 14:37:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 14:37:52 -0700 |
| commit | f37ab0fba271e43edab0e3ae9fe644fcda455402 (patch) | |
| tree | 9389e993a99c7ad87c0e8643d464c48f3ac97eca /drivers/media/video/uvc/uvc_queue.c | |
| parent | 0b0c9d3a5872e8a02a071c6f0775ee6bf00a1206 (diff) | |
| parent | 5510e62a66bad22b104d5d854445523d7f5754f7 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon updates from Jean Delvare:
"We have support for the MCP3021, MC13892 and GMT G781, automatic fan
speed control for LM63/LM64 chips, and a few clean-ups."
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Add MCP3021 ADC driver
hwmon: (mc13783-adc) Add support for the MC13892 PMIC
hwmon: (mc13783-adc) Remove space before tab
hwmon: (lm63) Let the user adjust the lookup table
hwmon: (lm63) Make fan speed control strategy changeable
hwmon: (lm63) Reorganize the code
hwmon: (lm90) Restore original configuration if probe function fails
hwmon: (lm90) Add support for GMT G781
hwmon: (lm90) Fix multi-line comments
hwmon: (w83795) Fix multi-line comments
hwmon: (w83795) Unconditionally support manual fan speed control
hwmon: (fam15h_power) Increase output resolution
hwmon: (fam15h_power) Correct sign extension of running_avg_capture
Diffstat (limited to 'drivers/media/video/uvc/uvc_queue.c')
0 files changed, 0 insertions, 0 deletions