summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-20 10:15:22 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-20 10:15:22 -0800
commita0c85e96d3b5609c918edd5a534a7cde9845b3fa (patch)
tree696c9adb92f73bde9f50e52fe315a868c2801cd8 /MAINTAINERS
parente58713724059da7d2982d6ad945192c8fca5b729 (diff)
parentf065a93e168299569078bc6f52128b57f602fff3 (diff)
downloadblackbird-op-linux-a0c85e96d3b5609c918edd5a534a7cde9845b3fa.tar.gz
blackbird-op-linux-a0c85e96d3b5609c918edd5a534a7cde9845b3fa.zip
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3f1e0081d3cb..6f99e1260db8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2873,7 +2873,6 @@ M: Guenter Roeck <guenter.roeck@ericsson.com>
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/
OpenPOWER on IntegriCloud