summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-02-10 09:04:37 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-02-10 09:04:37 -0800
commit1282ab3f8f7bca1d3a7fb701fbe4f0f772e72ea0 (patch)
treea573ae3ded43302fbb7c9b125ba9f1e45c4ae516 /kernel
parent19e00f2f1d5273dbc52eab0ebc315cae3aa44b2a (diff)
parenta1c1baf00e5c08dda9c0ee25658bf0ce301102ae (diff)
downloadlinux-1282ab3f8f7bca1d3a7fb701fbe4f0f772e72ea0.tar.bz2
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Couple of regressions, couple of zero-day bugs, a minor enhancement. Nothing really major. * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (f75375s) Let f75375_update_device treat pwmX as a measured value hwmon: (f75375s) Fix bit shifting in f75375_write16 hwmon: (f75375s) Fix reading of wrong register when initializing the F75387 hwmon: (f75375s) Fix automatic pwm mode setting for F75373 & F75375 hwmon: (w83627ehf) Remove duplicate code
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions