diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:09:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-02 19:09:35 -0700 |
| commit | 89c9fea3c8034cdb2fd745f551cde0b507fd6893 (patch) | |
| tree | c20880998ad9a212c83818eb3b62eaacab45a1fa /drivers/scsi | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching (diff) | |
| parent | tty: fix comment for __tty_alloc_driver() (diff) | |
| download | linux-dev-89c9fea3c8034cdb2fd745f551cde0b507fd6893.tar.xz linux-dev-89c9fea3c8034cdb2fd745f551cde0b507fd6893.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
tty: fix comment for __tty_alloc_driver()
init/main: properly align the multi-line comment
init/main: Fix double "the" in comment
Fix dead URLs to ftp.kernel.org
drivers: Clean up duplicated email address
treewide: Fix typo in xml/driver-api/basics.xml
tools/testing/selftests/powerpc: remove redundant CFLAGS in Makefile: "-Wall -O2 -Wall" -> "-O2 -Wall"
selftests/timers: Spelling s/privledges/privileges/
HID: picoLCD: Spelling s/REPORT_WRTIE_MEMORY/REPORT_WRITE_MEMORY/
net: phy: dp83848: Fix Typo
UBI: Fix typos
Documentation: ftrace.txt: Correct nice value of 120 priority
net: fec: Fix typo in error msg and comment
treewide: Fix typos in printk
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/mac_esp.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/snic/snic_scsi.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index 14c0334f41e4..bb567d3b0693 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c @@ -631,7 +631,7 @@ static void __exit mac_esp_exit(void) } MODULE_DESCRIPTION("Mac ESP SCSI driver"); -MODULE_AUTHOR("Finn Thain <fthain@telegraphics.com.au>"); +MODULE_AUTHOR("Finn Thain"); MODULE_LICENSE("GPL v2"); MODULE_VERSION(DRV_VERSION); MODULE_ALIAS("platform:" DRV_MODULE_NAME); diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c index abada16b375b..da979a73baa0 100644 --- a/drivers/scsi/snic/snic_scsi.c +++ b/drivers/scsi/snic/snic_scsi.c @@ -1066,7 +1066,7 @@ ioctl_hba_rst: if (!snic->remove_wait) { spin_unlock_irqrestore(io_lock, flags); SNIC_HOST_ERR(snic->shost, - "reset_cmpl:host reset completed after timout\n"); + "reset_cmpl:host reset completed after timeout\n"); ret = 1; return ret; |