diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 12:53:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-21 12:53:45 -0700 |
commit | 848a552893ff1fe071c57231edcd179cf84ec4f8 (patch) | |
tree | 720c74e623ead59f388f306b86fb0963f2813aec /include/scsi/osd_ore.h | |
parent | 43d451f163c1b615c1bedef95258c49712679eeb (diff) | |
parent | 1fa3a002b2546c42c343c77c144871285896ced5 (diff) | |
download | blackbird-op-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.gz blackbird-op-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.zip |
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 'include/scsi/osd_ore.h')
-rw-r--r-- | include/scsi/osd_ore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/osd_ore.h b/include/scsi/osd_ore.h index 6ca3265a4dca..7a8d2cd30328 100644 --- a/include/scsi/osd_ore.h +++ b/include/scsi/osd_ore.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2011 - * Boaz Harrosh <bharrosh@panasas.com> + * Boaz Harrosh <ooo@electrozaur.com> * * Public Declarations of the ORE API * |