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_protocol.h | |
| parent | Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration (diff) | |
| parent | Boaz Harrosh - fix email in Documentation (diff) | |
| download | linux-dev-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.xz linux-dev-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_protocol.h')
| -rw-r--r-- | include/scsi/osd_protocol.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/scsi/osd_protocol.h b/include/scsi/osd_protocol.h index a2594afe05c7..e0ca835e7bf7 100644 --- a/include/scsi/osd_protocol.h +++ b/include/scsi/osd_protocol.h @@ -4,7 +4,7 @@ * Copyright (C) 2008 Panasas Inc. All rights reserved. * * Authors: - * Boaz Harrosh <bharrosh@panasas.com> + * Boaz Harrosh <ooo@electrozaur.com> * Benny Halevy <bhalevy@panasas.com> * * This program is free software; you can redistribute it and/or modify @@ -496,7 +496,7 @@ struct osd_timestamp { */ struct osd_key_identifier { - u8 id[7]; /* if you know why 7 please email bharrosh@panasas.com */ + u8 id[7]; /* if you know why 7 please email ooo@electrozaur.com */ } __packed; /* for osd_capability.format */ |