From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 Jul 2011 18:12:06 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: v3.0-rc6~7
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b775c389252886b64f037a655934fa1df7c03006;p=~emulex%2Finfiniband.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: (k10temp) Update documentation for Fam12h
  hwmon-vid: Fix typo in VIA CPU name
  hwmon: (f71882fg) Add support for the F71869A
  hwmon: Use <> rather than () around my e-mail address
  hwmon: (emc6w201) Properly handle all errors
---

b775c389252886b64f037a655934fa1df7c03006