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, 4 insertions, 4 deletions

diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/skfp/h/smc.h
index 1758d9548361..026a83b9f743 100644
--- a/drivers/net/skfp/h/smc.h
+++ b/drivers/net/skfp/h/smc.h
@@ -393,10 +393,10 @@ struct smt_config {
                                          */
         u_long  mac_d_max ;             /* MAC : D_Max timer value */
 
-        u_long lct_short ;              /* LCT : error threshhold */
-        u_long lct_medium ;             /* LCT : error threshhold */
-        u_long lct_long ;               /* LCT : error threshhold */
-        u_long lct_extended ;           /* LCT : error threshhold */
+        u_long lct_short ;              /* LCT : error threshold */
+        u_long lct_medium ;             /* LCT : error threshold */
+        u_long lct_long ;               /* LCT : error threshold */
+        u_long lct_extended ;           /* LCT : error threshold */
 } ;
 
 #ifdef  DEBUG