From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 31 Jan 2012 01:08:40 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Tag: v3.3-rc2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c5d2bc11030568966f04a2af35bacf33d3e37af7;p=users%2Fwilly%2Flinux.git

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

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

c5d2bc11030568966f04a2af35bacf33d3e37af7