aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-27 21:46:08 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-08-27 21:46:08 -0700
commit2ac5f852bd0634c585a6cf55c78bc457f451dcdf (patch)
tree12ad94a8fb2ba299bfc21e2b3f480915c924f86e /MAINTAINERS
parent7ba1eb3832297cc0988bf52d309fa3575b159c22 (diff)
parentd25d70b1ff6548b336d537c4c602249e1d7fe8e5 (diff)
downloadhistory-2ac5f852bd0634c585a6cf55c78bc457f451dcdf.tar.gz
Merge bk://linux-scsi.bkbits.net/scsi-for-linus-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f7e6d71a995c81..b1c5808a6c896f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -627,6 +627,8 @@ DC390/AM53C974 SCSI driver
P: Kurt Garloff
M: garloff@suse.de
W: http://www.garloff.de/kurt/linux/dc390/
+P: Guennadi Liakhovetski
+M: g.liakhovetski@gmx.de
S: Maintained
DECnet NETWORK LAYER
@@ -957,6 +959,12 @@ L: sensors@stimpy.netroedge.com
W: http://www.lm-sensors.nu/
S: Maintained
+I2O
+P: Markus Lidel
+M: markus.lidel@shadowconnect.com
+W: http://i2o.shadowconnect.com/
+S: Maintained
+
i386 BOOT CODE
P: Riley H. Williams
M: Riley@Williams.Name