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/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index 8a5d35b759dd..ce4136eea08f 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -43,9 +43,9 @@ enum {
         /*
          * SATA-FSL host controller supports a max. of (15+1) direct PRDEs, and
          * chained indirect PRDEs upto a max count of 63.
-         * We are allocating an array of 63 PRDEs contigiously, but PRDE#15 will
+         * We are allocating an array of 63 PRDEs contiguously, but PRDE#15 will
          * be setup as an indirect descriptor, pointing to it's next
-         * (contigious) PRDE. Though chained indirect PRDE arrays are
+         * (contiguous) PRDE. Though chained indirect PRDE arrays are
          * supported,it will be more efficient to use a direct PRDT and
          * a single chain/link to indirect PRDE array/PRDT.
          */
@@ -314,7 +314,7 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc,
         u32 ttl_dwords = 0;
 
         /*
-         * NOTE : direct & indirect prdt's are contigiously allocated
+         * NOTE : direct & indirect prdt's are contiguously allocated
          */
         struct prde *prd = (struct prde *)&((struct command_desc *)
                                             cmd_desc)->prdt;