aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 20:31:27 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 20:31:27 -0400
commit0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch)
tree67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /MAINTAINERS
parentdb400b3c4ee89d384d9163836a55577abdae772d (diff)
parent17fa53da1239b8712c5cebbd72a74c713b6c2db9 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 2af78e965dd7..8e4e82921070 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -822,6 +822,13 @@ L: emu10k1-devel@lists.sourceforge.net
822W: http://sourceforge.net/projects/emu10k1/ 822W: http://sourceforge.net/projects/emu10k1/
823S: Maintained 823S: Maintained
824 824
825EMULEX LPFC FC SCSI DRIVER
826P: James Smart
827M: james.smart@emulex.com
828L: linux-scsi@vger.kernel.org
829W: http://sourceforge.net/projects/lpfcxxxx
830S: Supported
831
825EPSON 1355 FRAMEBUFFER DRIVER 832EPSON 1355 FRAMEBUFFER DRIVER
826P: Christopher Hoover 833P: Christopher Hoover
827M: ch@murgatroid.com, ch@hpl.hp.com 834M: ch@murgatroid.com, ch@hpl.hp.com