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 /drivers/scsi/osd/Kconfig | |
parent | 43d451f163c1b615c1bedef95258c49712679eeb (diff) | |
parent | 1fa3a002b2546c42c343c77c144871285896ced5 (diff) | |
download | linux-848a552893ff1fe071c57231edcd179cf84ec4f8.tar.bz2 |
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/Kconfig')
-rw-r--r-- | drivers/scsi/osd/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/osd/Kconfig b/drivers/scsi/osd/Kconfig index a0703514eb0f..347cc5e33749 100644 --- a/drivers/scsi/osd/Kconfig +++ b/drivers/scsi/osd/Kconfig @@ -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 |