Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 15:11:43 +0000 (08:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Sep 2011 15:11:43 +0000 (08:11 -0700)
* 'hwmon-for-linus' of git://github.com/groeck/linux:
  hwmon: (ucd9000/ucd9200) Optimize array walk
  hwmon: (max16065) Add chip access warning to documentation
  hwmon: (max16065) Fix current calculation


Trivial merge