]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
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)
* '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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge