tree 7ee3d85adf256491dae89e5b049bb28ef1a1680c
parent d3ec4844d449cf7af9e749f73ba2052fb7b72fc2
parent 156e2d1adc03e17f18f98d297f7757fc6d93a589
author Linus Torvalds <torvalds@linux-foundation.org> 1311628234 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311628234 -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: (lm78) Become the maintainer
  hwmon: (lm78) Make ISA interface depend on CONFIG_ISA
  hwmon: (lm78) Avoid forward declarations
  hwmon: (sht15) Correct a comment mistake
  hwmon: (max1111) Avoid extra memory allocations
  hwmon: (it87) Add chassis intrusion detection support
  hwmon: (via-cputemp) Add VID reporting support
  hwmon-vid: Add support for VIA family 6 model D CPU
  hwmon: New driver sch5636
  hwmon: (sch5627) Factor out some code shared with sch5636 driver