diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 20:06:53 -0500 |
commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /MAINTAINERS | |
parent | dbc1651f0c5b7d13acc59d3b805a7224332fb1fb (diff) | |
parent | b3c29d85bf0dcce9e99cbfba2811aeefae017aaa (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 270e28c0506a..9b788d779472 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -546,13 +546,6 @@ W: http://linuxtv.org | |||
546 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git | 546 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git |
547 | S: Maintained | 547 | S: Maintained |
548 | 548 | ||
549 | BUSLOGIC SCSI DRIVER | ||
550 | P: Leonard N. Zubkoff | ||
551 | M: Leonard N. Zubkoff <lnz@dandelion.com> | ||
552 | L: linux-scsi@vger.kernel.org | ||
553 | W: http://www.dandelion.com/Linux/ | ||
554 | S: Maintained | ||
555 | |||
556 | COMMON INTERNET FILE SYSTEM (CIFS) | 549 | COMMON INTERNET FILE SYSTEM (CIFS) |
557 | P: Steve French | 550 | P: Steve French |
558 | M: sfrench@samba.org | 551 | M: sfrench@samba.org |