From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 29 Apr 2011 21:58:34 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v2.6.39-rc6~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=592311c91daece7d6503bdef8fcc434f829aad23;p=~shefty%2Frdma-dev.git

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (lm85) Fix error paths in probe function
  hwmon: (lm85) Add missing list terminators
  hwmon: (adm1021) Clarify documentation regarding Xeon processors
  hwmon: (lm90) Fix update interval information in driver documentation
  hwmon: (lm90) Add support for ADT7461A and NCT1008
---

592311c91daece7d6503bdef8fcc434f829aad23