diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 19:43:33 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 19:43:33 -0800 | 
| commit | 4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8 (patch) | |
| tree | 856ba96302a36014736747e8464f80eeb827bbdd /drivers/scsi/lpfc/lpfc_els.c | |
| parent | f6c4c8195b5e7878823caa1181be404d9e86d369 (diff) | |
| parent | d014d043869cdc591f3a33243d3481fa4479c2d0 (diff) | |
| download | olio-linux-3.10-4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8.tar.xz olio-linux-3.10-4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8.zip  | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
  tree-wide: fix misspelling of "definition" in comments
  reiserfs: fix misspelling of "journaled"
  doc: Fix a typo in slub.txt.
  inotify: remove superfluous return code check
  hdlc: spelling fix in find_pvc() comment
  doc: fix regulator docs cut-and-pasteism
  mtd: Fix comment in Kconfig
  doc: Fix IRQ chip docs
  tree-wide: fix assorted typos all over the place
  drivers/ata/libata-sff.c: comment spelling fixes
  fix typos/grammos in Documentation/edac.txt
  sysctl: add missing comments
  fs/debugfs/inode.c: fix comment typos
  sgivwfb: Make use of ARRAY_SIZE.
  sky2: fix sky2_link_down copy/paste comment error
  tree-wide: fix typos "couter" -> "counter"
  tree-wide: fix typos "offest" -> "offset"
  fix kerneldoc for set_irq_msi()
  spidev: fix double "of of" in comment
  comment typo fix: sybsystem -> subsystem
  ...
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_els.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_els.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index a079bbc03cf..ce522702a6c 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c @@ -815,7 +815,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,  	/* FLOGI completes successfully */  	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, -			 "0101 FLOGI completes sucessfully " +			 "0101 FLOGI completes successfully "  			 "Data: x%x x%x x%x x%x\n",  			 irsp->un.ulpWord[4], sp->cmn.e_d_tov,  			 sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution); @@ -4151,7 +4151,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,  	/* Indicate we are walking fc_rscn_id_list on this vport */  	vport->fc_rscn_flush = 1;  	spin_unlock_irq(shost->host_lock); -	/* Get the array count after sucessfully have the token */ +	/* Get the array count after successfully have the token */  	rscn_cnt = vport->fc_rscn_id_cnt;  	/* If we are already processing an RSCN, save the received  	 * RSCN payload buffer, cmdiocb->context2 to process later.  |