Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2012 01:08:40 +0000 (17:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 Jan 2012 01:08:40 +0000 (17:08 -0800)
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (w83627ehf) Disable setting DC mode for pwm2, pwm3 on NCT6776F
  hwmon: (sht15) fix bad error code
  MAINTAINERS: Drop maintainer for MAX1668 hwmon driver
  MAINTAINERS: Add hwmon entries for Wolfson
  hwmon: (f71805f) Fix clamping of temperature limits

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge