diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-11 04:12:24 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-11 04:12:24 +0200 |
commit | 04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea (patch) | |
tree | 0190a2610ade331b4be8e1efd094c0ad2b2ba181 /MAINTAINERS | |
parent | Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | osdblk: Adjust queue limits to lower device's limits (diff) | |
download | linux-04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea.tar.xz linux-04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea.zip |
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/ S: Maintained F: drivers/net/wireless/orinoco/ -OSD LIBRARY +OSD LIBRARY and FILESYSTEM P: Boaz Harrosh M: bharrosh@panasas.com P: Benny Halevy @@ -4416,6 +4416,9 @@ L: osd-dev@open-osd.org W: http://open-osd.org T: git git://git.open-osd.org/open-osd.git S: Maintained +F: drivers/scsi/osd/ +F: drivers/include/scsi/osd_* +F: fs/exofs/ P54 WIRELESS DRIVER P: Michael Wu |