diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 22:12:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 22:12:24 -0400 |
commit | 04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea (patch) | |
tree | 0190a2610ade331b4be8e1efd094c0ad2b2ba181 /MAINTAINERS | |
parent | bb8ad2815a1210bfa56b8f8ebf0e40fbdf9198ff (diff) | |
parent | bc47df0fa705887242c26c7b040e7cf0170ab1f1 (diff) |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
osdblk: Adjust queue limits to lower device's limits
osdblk: a Linux block device for OSD objects
MAINTAINERS: Add osd maintained files (F:)
exofs: Avoid using file_fsync()
exofs: Remove IBM copyrights
exofs: Fix bio leak in error handling path (sync read)
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e4b1a3d596cc..494059d60134 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4407,7 +4407,7 @@ W: http://www.nongnu.org/orinoco/ | |||
4407 | S: Maintained | 4407 | S: Maintained |
4408 | F: drivers/net/wireless/orinoco/ | 4408 | F: drivers/net/wireless/orinoco/ |
4409 | 4409 | ||
4410 | OSD LIBRARY | 4410 | OSD LIBRARY and FILESYSTEM |
4411 | P: Boaz Harrosh | 4411 | P: Boaz Harrosh |
4412 | M: bharrosh@panasas.com | 4412 | M: bharrosh@panasas.com |
4413 | P: Benny Halevy | 4413 | P: Benny Halevy |
@@ -4416,6 +4416,9 @@ L: osd-dev@open-osd.org | |||
4416 | W: http://open-osd.org | 4416 | W: http://open-osd.org |
4417 | T: git git://git.open-osd.org/open-osd.git | 4417 | T: git git://git.open-osd.org/open-osd.git |
4418 | S: Maintained | 4418 | S: Maintained |
4419 | F: drivers/scsi/osd/ | ||
4420 | F: drivers/include/scsi/osd_* | ||
4421 | F: fs/exofs/ | ||
4419 | 4422 | ||
4420 | P54 WIRELESS DRIVER | 4423 | P54 WIRELESS DRIVER |
4421 | P: Michael Wu | 4424 | P: Michael Wu |