From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Feb 2012 17:04:37 +0000 (-0800)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1282ab3f8f7bca1d3a7fb701fbe4f0f772e72ea0;p=linux-beck.git

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
---

1282ab3f8f7bca1d3a7fb701fbe4f0f772e72ea0