tree 0006f1cd2f1b1be6c7149a3234a9ab3ff76c7e80
parent c82ffab9a857f8286ed2b559624b7005a367b638
parent 58f055e5314856a3badfa61fe144347903488989
author Linus Torvalds <torvalds@linux-foundation.org> 1253744416 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253744416 -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: (ltc4245) Clear faults at startup
  hwmon: (ltc4215) Clear faults at startup
  hwmon: (coretemp) Add Lynnfield CPU
  hwmon: (coretemp) Add support for Penryn mobile CPUs
  hwmon: (coretemp) Fix Atom CPUs support
  hwmon: Delete deprecated FSC drivers
  hwmon: (adm1031) Add sysfs files for temperature offsets