diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:22:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-09 12:22:36 -0500 |
| commit | 68a696a01f482859a9fe937249e8b3d44252b610 (patch) | |
| tree | 42f2465a5f4ad008734ad45d61204d950ece7338 /MAINTAINERS | |
| parent | dcb92f8804717b845db70939b523c5d152a2e0ea (diff) | |
| parent | f85da084151c9454891124c999006857a354622a (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc:
[EISA] EISA registration with !CONFIG_EISA
[TC] pmagb-b-fb: Convert to the driver model
[TC] dec_esp: Driver model for the PMAZ-A
[TC] mips: pmag-ba-fb: Convert to the driver model
[TC] defxx: TURBOchannel support
[TC] TURBOchannel support for the DECstation
[TC] MIPS: TURBOchannel resources off-by-one fix
[TC] MIPS: TURBOchannel update to the driver model
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f2a79481f1c..a6c1ebd18d0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3293,6 +3293,11 @@ L: vtun@office.satix.net | |||
| 3293 | W: http://vtun.sourceforge.net/tun | 3293 | W: http://vtun.sourceforge.net/tun |
| 3294 | S: Maintained | 3294 | S: Maintained |
| 3295 | 3295 | ||
| 3296 | TURBOCHANNEL SUBSYSTEM | ||
| 3297 | P: Maciej W. Rozycki | ||
| 3298 | M: macro@linux-mips.org | ||
| 3299 | S: Maintained | ||
| 3300 | |||
| 3296 | U14-34F SCSI DRIVER | 3301 | U14-34F SCSI DRIVER |
| 3297 | P: Dario Ballabio | 3302 | P: Dario Ballabio |
| 3298 | M: ballabio_dario@emc.com | 3303 | M: ballabio_dario@emc.com |