diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 17:14:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 17:14:57 -0400 |
| commit | 20731945ae743034353a88c307920d1f16cf8ac8 (patch) | |
| tree | 132c796fe3a167dece8cec7a40b1d5dd83a68bc8 /MAINTAINERS | |
| parent | 406119f49d4a6cf8b6eee639128e0575a95065e3 (diff) | |
| parent | a9d1b24d91f91b77db3da8aeacb414764f789b9c (diff) | |
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 | |||
| 2736 | M: rl@hellgate.ch | 2736 | M: rl@hellgate.ch |
| 2737 | S: Maintained | 2737 | S: Maintained |
| 2738 | 2738 | ||
| 2739 | VIAPRO SMBUS DRIVER | ||
| 2740 | P: Jean Delvare | ||
| 2741 | M: khali@linux-fr.org | ||
| 2742 | L: lm-sensors@lm-sensors.org | ||
| 2743 | S: Maintained | ||
| 2744 | |||
| 2739 | UCLINUX (AND M68KNOMMU) | 2745 | UCLINUX (AND M68KNOMMU) |
| 2740 | P: Greg Ungerer | 2746 | P: Greg Ungerer |
| 2741 | M: gerg@uclinux.org | 2747 | M: gerg@uclinux.org |