diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 02:31:27 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 02:31:27 +0200 |
commit | 0481990b758628e12f4b0a9e15094e70cefc7cd1 (patch) | |
tree | 67a4b4b7acc6a688b87ef2a2d3ec0e296e6e480c /MAINTAINERS | |
parent | Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airli... (diff) | |
parent | Merge by hand (conflicts in sd.c) (diff) | |
download | linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.tar.xz linux-0481990b758628e12f4b0a9e15094e70cefc7cd1.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
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 W: http://sourceforge.net/projects/emu10k1/ S: Maintained +EMULEX LPFC FC SCSI DRIVER +P: James Smart +M: james.smart@emulex.com +L: linux-scsi@vger.kernel.org +W: http://sourceforge.net/projects/lpfcxxxx +S: Supported + EPSON 1355 FRAMEBUFFER DRIVER P: Christopher Hoover M: ch@murgatroid.com, ch@hpl.hp.com |