From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Mar 2012 17:37:25 +0000 (-0700)
Subject: Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=31f6765266417c0d99f0e922fe82848a7c9c2ae9;p=linux-edison.git

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

Pull hwmon changes for v3.4 from Guenter Roeck:
 "Mostly cleanup.  No new drivers this time around, but support for
  several chips added to existing drivers: TPS40400, TPS40422, MTD040,
  MAX34446, ZL9101M, ZL9117M, and LM96080.  Also, added watchdog support
  for SCH56xx, and additional attributes for a couple of drivers."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (137 commits)
  hwmon: (sch56xx) Add support for the integrated watchdog (v2)
  hwmon: (w83627ehf) Add support for temperature offset registers
  hwmon: (jc42) Remove unnecessary device IDs
  hwmon: (zl6100) Add support for ZL9101M and ZL9117M
  hwmon: (adm1275) Add support for ADM1075
  hwmon: (max34440) Add support for MAX34446
  hwmon: (pmbus) Add more virtual registers
  hwmon: (pmbus) Add support for Lineage Power MDT040
  hwmon: (pmbus) Add support for TI TPS40400 and TPS40422
  hwmon: (max34440) Add support for 'lowest' output voltage attribute
  hwmon: (jc42) Convert to use devm_kzalloc
  hwmon: (max16065) Convert to use devm_kzalloc
  hwmon: (smm665) Convert to use devm_kzalloc
  hwmon: (ltc4261) Convert to use devm_kzalloc
  hwmon: (pmbus) Simplify remove functions
  hwmon: (pmbus) Convert pmbus drivers to use devm_kzalloc
  hwmon: (lineage-pem) Convert to use devm_kzalloc
  hwmon: (hwmon-vid) Fix checkpatch issues
  hwmon: (hwmon-vid) Add new entries to VRM model table
  hwmon: (lm80) Add detection of NatSemi/TI LM96080
  ...
---

31f6765266417c0d99f0e922fe82848a7c9c2ae9
diff --cc Documentation/hwmon/adm1275
index e5f982c845f,535ad23ea70..2cfa2566712
--- a/Documentation/hwmon/adm1275
+++ b/Documentation/hwmon/adm1275
@@@ -51,9 -59,10 +59,10 @@@ The following attributes are supported
  attributes are write-only, all other attributes are read-only.
  
  in1_label		"vin1" or "vout1" depending on chip variant and
- 			configuration.
+ 			configuration. On ADM1075, vout1 reports the voltage on
+ 			the VAUX pin.
  in1_input		Measured voltage.
 -in1_min			Minumum Voltage.
 +in1_min			Minimum Voltage.
  in1_max			Maximum voltage.
  in1_min_alarm		Voltage low alarm.
  in1_max_alarm		Voltage high alarm.