diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:16:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 00:16:32 -0400 |
| commit | 7f0852f959d8e92786c684ebd7fee3332a2f4efe (patch) | |
| tree | 0fc9278f4094ba5e9c84c3c22608469f77393a2e /MAINTAINERS | |
| parent | 2f1b9250516aa8744496abbbbb8a6066cb2b56db (diff) | |
| parent | f01cfb3638a2f1ee584913f37e5ba7a8abfed8de (diff) | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6 of HEAD
* HEAD:
[PATCH] w1: remove drivers/w1/w1.h
[PATCH] w1: fix idle check loop in ds2482
[PATCH] W1: remove w1 mail list from lm_sensors.
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 645a9f85f33f..491e034f3475 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3180,7 +3180,6 @@ S: Maintained | |||
| 3180 | W1 DALLAS'S 1-WIRE BUS | 3180 | W1 DALLAS'S 1-WIRE BUS |
| 3181 | P: Evgeniy Polyakov | 3181 | P: Evgeniy Polyakov |
| 3182 | M: johnpol@2ka.mipt.ru | 3182 | M: johnpol@2ka.mipt.ru |
| 3183 | L: lm-sensors@lm-sensors.org | ||
| 3184 | S: Maintained | 3183 | S: Maintained |
| 3185 | 3184 | ||
| 3186 | W83L51xD SD/MMC CARD INTERFACE DRIVER | 3185 | W83L51xD SD/MMC CARD INTERFACE DRIVER |