diff options
author | Linus Torvalds | 2014-10-21 21:53:45 +0200 |
---|---|---|
committer | Linus Torvalds | 2014-10-21 21:53:45 +0200 |
commit | 848a552893ff1fe071c57231edcd179cf84ec4f8 (patch) | |
tree | 720c74e623ead59f388f306b86fb0963f2813aec /drivers/scsi/osd/osd_uld.c | |
parent | Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/workin... (diff) | |
parent | Boaz Harrosh - fix email in Documentation (diff) | |
download | kernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.gz kernel-qcow2-linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.xz kernel-qcow2-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 'drivers/scsi/osd/osd_uld.c')
-rw-r--r-- | drivers/scsi/osd/osd_uld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index e1d9a4c4c4b3..92cdd4b06526 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c @@ -10,7 +10,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 @@ -74,7 +74,7 @@ static const char osd_name[] = "osd"; static const char *osd_version_string = "open-osd 0.2.1"; -MODULE_AUTHOR("Boaz Harrosh <bharrosh@panasas.com>"); +MODULE_AUTHOR("Boaz Harrosh <ooo@electrozaur.com>"); MODULE_DESCRIPTION("open-osd Upper-Layer-Driver osd.ko"); MODULE_LICENSE("GPL"); MODULE_ALIAS_CHARDEV_MAJOR(SCSI_OSD_MAJOR); |