diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-20 13:15:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-20 13:15:22 -0500 |
| commit | a0c85e96d3b5609c918edd5a534a7cde9845b3fa (patch) | |
| tree | 696c9adb92f73bde9f50e52fe315a868c2801cd8 /MAINTAINERS | |
| parent | e58713724059da7d2982d6ad945192c8fca5b729 (diff) | |
| parent | f065a93e168299569078bc6f52128b57f602fff3 (diff) | |
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-- | MAINTAINERS | 1 |
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> | |||
| 2873 | L: lm-sensors@lm-sensors.org | 2873 | L: lm-sensors@lm-sensors.org |
| 2874 | W: http://www.lm-sensors.org/ | 2874 | W: http://www.lm-sensors.org/ |
| 2875 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ | 2875 | T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ |
| 2876 | T: quilt kernel.org/pub/linux/kernel/people/groeck/linux-staging/ | ||
| 2877 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git | 2876 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git |
| 2878 | S: Maintained | 2877 | S: Maintained |
| 2879 | F: Documentation/hwmon/ | 2878 | F: Documentation/hwmon/ |