From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Feb 2011 18:15:22 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0c85e96d3b5609c918edd5a534a7cde9845b3fa;p=linux-beck.git

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
---

a0c85e96d3b5609c918edd5a534a7cde9845b3fa