50ec0b4d99826bb7
parent f020b007d5dd24597f5e985a6309bcb8393797ed
author Linus Torvalds <torvalds@linux-foundation.org> 1315408303 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1315408303 -0700

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