diff options
author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:31:02 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:31:02 -0700 |
commit | 8566cfc9fe0934f52ddedc12b083176116c13978 (patch) | |
tree | b0f92fd0982a4dabaa2c108f4f1d130d2cff6798 /MAINTAINERS | |
parent | 7bdb2b6aca356c765bb697a4e9e7599357ee1542 (diff) | |
parent | 77ae84554cc0178e03862391599a0cedf96fa4c4 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5899ec1504f..7e1f67130a1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -933,6 +933,13 @@ M: khc@pm.waw.pl W: http://www.kernel.org/pub/linux/utils/net/hdlc/ S: Maintained +HARDWARE MONITORING +P: Jean Delvare +M: khali@linux-fr.org +L: lm-sensors@lm-sensors.org +W: http://www.lm-sensors.nu/ +S: Maintained + HARMONY SOUND DRIVER P: Kyle McMartin M: kyle@parisc-linux.org @@ -1014,7 +1021,7 @@ P: William Irwin M: wli@holomorphy.com S: Maintained -I2C AND SENSORS DRIVERS +I2C SUBSYSTEM P: Greg Kroah-Hartman M: greg@kroah.com P: Jean Delvare |