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)
commit4fc1d39e079e28a5daa2e6ffe6d27c064c7493ce
tree0bc5b0661597d7cc96eea63c2928b10277f9c45e
parent28c51ee3da3be98a3d7ce54250ec0b4d99826bb7
parentf020b007d5dd24597f5e985a6309bcb8393797ed
Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux

* '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