Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec...

* '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

diff --combined MAINTAINERS
index 3f1e0081d3cbeb9ef538fe7d36c06ad042354212,c0ae392f41b48521f7de1f35af7a5969d7a78e0b..6f99e1260db835105b4c8624898e9b8a054acf70
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -885,7 -885,7 +885,7 @@@ S: Supporte
  
  ARM/QUALCOMM MSM MACHINE SUPPORT
  M:    David Brown <davidb@codeaurora.org>
 -M:    Daniel Walker <dwalker@codeaurora.org>
 +M:    Daniel Walker <dwalker@fifo99.com>
  M:    Bryan Huntsman <bryanh@codeaurora.org>
  L:    linux-arm-msm@vger.kernel.org
  F:    arch/arm/mach-msm/
@@@ -2873,7 -2873,6 +2873,6 @@@ M:      Guenter Roeck <guenter.roeck@ericsso
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
  T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
- T:    quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
  S:    Maintained
  F:    Documentation/hwmon/