diff --git a/[refs] b/[refs] index 65ca95be12de..9cbc99713f4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: baaf94cdc7fe1c61e3c660a3b055724fd9d0a034 +refs/heads/master: 42c55aa838bbd274a7ad2be1fd81d423ca63da4e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index dc226e78612c..b9b208955098 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4321,7 +4321,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 @@ -4330,6 +4330,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