diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 15:53:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 15:53:45 -0400 |
commit | 848a552893ff1fe071c57231edcd179cf84ec4f8 (patch) | |
tree | 720c74e623ead59f388f306b86fb0963f2813aec /Documentation/scsi | |
parent | 43d451f163c1b615c1bedef95258c49712679eeb (diff) | |
parent | 1fa3a002b2546c42c343c77c144871285896ced5 (diff) |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
Pull email address change from Boaz Harrosh.
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
Boaz Harrosh - fix email in Documentation
Boaz Harrosh - Fix broken email address
MAINTAINERS: Change Boaz Harrosh's email
Diffstat (limited to 'Documentation/scsi')
-rw-r--r-- | Documentation/scsi/osd.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/scsi/osd.txt b/Documentation/scsi/osd.txt index da162f7fd5f5..5a9879bad073 100644 --- a/Documentation/scsi/osd.txt +++ b/Documentation/scsi/osd.txt | |||
@@ -184,8 +184,7 @@ Any problems, questions, bug reports, lonely OSD nights, please email: | |||
184 | More up-to-date information can be found on: | 184 | More up-to-date information can be found on: |
185 | http://open-osd.org | 185 | http://open-osd.org |
186 | 186 | ||
187 | Boaz Harrosh <bharrosh@panasas.com> | 187 | Boaz Harrosh <ooo@electrozaur.com> |
188 | Benny Halevy <bhalevy@panasas.com> | ||
189 | 188 | ||
190 | References | 189 | References |
191 | ========== | 190 | ========== |