From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Mar 2012 01:22:54 +0000 (-0800)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Tag: v3.3-rc7~16
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=42a6c7ef3b204ef9bfd0e5b65ccd8c67f4a6cedf;p=~emulex%2Finfiniband.git

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

Pull four hwmon patches from Guenter Roeck

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (jc42) Add support for AT30TS00, TS3000GB2, TSE2002GB2, and MCP9804
  hwmon: (zl6100) Maintain delay parameter in driver instance data
  hwmon: (pmbus_core) Fix maximum number of POUT alarm attributes
  hwmon: (jc42) Add support for ST Microelectronics STTS2002 and STTS3000
---

42a6c7ef3b204ef9bfd0e5b65ccd8c67f4a6cedf