aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 09:22:36 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-09 09:22:36 -0800
commit68a696a01f482859a9fe937249e8b3d44252b610 (patch)
tree42f2465a5f4ad008734ad45d61204d950ece7338 /MAINTAINERS
parentdcb92f8804717b845db70939b523c5d152a2e0ea (diff)
parentf85da084151c9454891124c999006857a354622a (diff)
downloadkernel_samsung_aries-68a696a01f482859a9fe937249e8b3d44252b610.zip
kernel_samsung_aries-68a696a01f482859a9fe937249e8b3d44252b610.tar.gz
kernel_samsung_aries-68a696a01f482859a9fe937249e8b3d44252b610.tar.bz2
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--MAINTAINERS5
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f2a7948..a6c1ebd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3293,6 +3293,11 @@ L: vtun@office.satix.net
W: http://vtun.sourceforge.net/tun
S: Maintained
+TURBOCHANNEL SUBSYSTEM
+P: Maciej W. Rozycki
+M: macro@linux-mips.org
+S: Maintained
+
U14-34F SCSI DRIVER
P: Dario Ballabio
M: ballabio_dario@emc.com