Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Feb 2011 18:15:22 +0000 (10:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 20 Feb 2011 18:15:22 +0000 (10:15 -0800)
commita0c85e96d3b5609c918edd5a534a7cde9845b3fa
tree696c9adb92f73bde9f50e52fe315a868c2801cd8
parente58713724059da7d2982d6ad945192c8fca5b729
parentf065a93e168299569078bc6f52128b57f602fff3
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (lm85) extend to support EMC6D103 chips
  MAINTAINERS: Remove stale hwmon quilt tree
  hwmon: (k10temp) add support for AMD Family 12h/14h CPUs
  hwmon: (jc42) do not allow writing to locked registers
  hwmon: (jc42) more helpful documentation
  hwmon: (jc42) fix type mismatch
MAINTAINERS