diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 23:14:57 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 23:14:57 +0200 |
commit | 20731945ae743034353a88c307920d1f16cf8ac8 (patch) | |
tree | 132c796fe3a167dece8cec7a40b1d5dd83a68bc8 /MAINTAINERS | |
parent | [PATCH] Ensure that 'make distclean' does not delete files in '.git' (diff) | |
parent | [PATCH] I2C: add i2c module alias for i2c drivers to use (diff) | |
download | linux-20731945ae743034353a88c307920d1f16cf8ac8.tar.xz linux-20731945ae743034353a88c307920d1f16cf8ac8.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 248b93b32fc4..3928dc7d6ea9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2736,6 +2736,12 @@ P: Roger Luethi M: rl@hellgate.ch S: Maintained +VIAPRO SMBUS DRIVER +P: Jean Delvare +M: khali@linux-fr.org +L: lm-sensors@lm-sensors.org +S: Maintained + UCLINUX (AND M68KNOMMU) P: Greg Ungerer M: gerg@uclinux.org |