summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 12:53:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-21 12:53:45 -0700
commit848a552893ff1fe071c57231edcd179cf84ec4f8 (patch)
tree720c74e623ead59f388f306b86fb0963f2813aec /Documentation
parent43d451f163c1b615c1bedef95258c49712679eeb (diff)
parent1fa3a002b2546c42c343c77c144871285896ced5 (diff)
downloadop-kernel-dev-848a552893ff1fe071c57231edcd179cf84ec4f8.zip
op-kernel-dev-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.gz
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')
-rw-r--r--Documentation/scsi/osd.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/scsi/osd.txt b/Documentation/scsi/osd.txt
index da162f7..5a9879b 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:
More up-to-date information can be found on:
http://open-osd.org
-Boaz Harrosh <bharrosh@panasas.com>
-Benny Halevy <bhalevy@panasas.com>
+Boaz Harrosh <ooo@electrozaur.com>
References
==========
OpenPOWER on IntegriCloud