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
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index 3441b3f90827..2752b56cad56 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -771,11 +771,11 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = {
         {0x01180600, IOASC_LOG_LEVEL_MUST,
          "Recovered Error, soft media error, sector reassignment suggested"},
         {0x015D0000, IOASC_LOG_LEVEL_MUST,
-         "Recovered Error, failure prediction thresold exceeded"},
+         "Recovered Error, failure prediction threshold exceeded"},
         {0x015D9200, IOASC_LOG_LEVEL_MUST,
-         "Recovered Error, soft Cache Card Battery error thresold"},
+         "Recovered Error, soft Cache Card Battery error threshold"},
         {0x015D9200, IOASC_LOG_LEVEL_MUST,
-         "Recovered Error, soft Cache Card Battery error thresold"},
+         "Recovered Error, soft Cache Card Battery error threshold"},
         {0x02048000, IOASC_LOG_LEVEL_MUST,
          "Not Ready, IOA Reset Required"},
         {0x02408500, IOASC_LOG_LEVEL_MUST,