tree 4462f9e75d1cfdcef6bdb37e36dec8a40418c7b8
parent 9508d80530add1281ac4d5032ab650eaf0b41aa4
parent af75d5b771269f764999a67511e7d0c995d1a185
author Linus Torvalds <torvalds@linux-foundation.org> 1309716726 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1309716726 -0700

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (k10temp) Update documentation for Fam12h
  hwmon-vid: Fix typo in VIA CPU name
  hwmon: (f71882fg) Add support for the F71869A
  hwmon: Use <> rather than () around my e-mail address
  hwmon: (emc6w201) Properly handle all errors