Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
 "Usual rocket science stuff from trivial.git"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  neighbour.h: fix comment
  sched: Fix warning on make htmldocs caused by wait.h
  slab: struct kmem_cache is protected by slab_mutex
  doc: Fix typo in USB Gadget Documentation
  of/Kconfig: Spelling s/one/once/
  mkregtable: Fix sscanf handling
  lp5523, lp8501: comment improvements
  thermal: rcar: comment spelling
  treewide: fix comments and printk msgs
  IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
  Documentation: update /proc/uptime field description
  Documentation: Fix size parameter for snprintf
  arm: fix comment header and macro name
  asm-generic: uaccess: Spelling s/a ny/any/
  mtd: onenand: fix comment header
  doc: driver-model/platform.txt: fix a typo
  drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
  doc: Fix typo (acces_process_vm -> access_process_vm)
  treewide: Fix typos in printk
  drivers/gpu/drm/qxl/Kconfig: reformat the help text
  ...

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1f02003ea08d..c8bd092fc945 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -204,9 +204,9 @@ config SCSI_MULTI_LUN
           Some devices support more than one LUN (Logical Unit Number) in order
           to allow access to several media, e.g. CD jukebox, USB card reader,
           mobile phone in mass storage mode. This option forces the kernel to
-          probe for all LUNs by default. This setting can be overriden by
+          probe for all LUNs by default. This setting can be overridden by
           max_luns boot/module parameter. Note that this option does not affect
-          devices conforming to SCSI-3 or higher as they can explicitely report
+          devices conforming to SCSI-3 or higher as they can explicitly report
           their number of LUNs. It is safe to say Y here unless you have one of
           those rare devices which reacts in an unexpected way when probed for
           multiple LUNs.
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index b45f4d78ee36..f60989d729a8 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -2254,7 +2254,7 @@ qla8044_minidump_process_rdmem(struct scsi_qla_host *vha,
 
         if (r_addr & 0xf) {
                 ql_dbg(ql_dbg_p3p, vha, 0xb0f1,
-                    "[%s]: Read addr 0x%x not 16 bytes alligned\n",
+                    "[%s]: Read addr 0x%x not 16 bytes aligned\n",
                     __func__, r_addr);
                 return QLA_FUNCTION_FAILED;
         }
diff --git a/drivers/scsi/qla4xxx/ql4_83xx.c b/drivers/scsi/qla4xxx/ql4_83xx.c
index 8196c2f7915c..919284834ad7 100644
--- a/drivers/scsi/qla4xxx/ql4_83xx.c
+++ b/drivers/scsi/qla4xxx/ql4_83xx.c
@@ -465,7 +465,7 @@ int qla4_83xx_drv_lock(struct scsi_qla_host *ha)
                                 }
                                 /* Recovery Failed, some other function
                                  * has the lock, wait for 2secs and retry */
-                                ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timout\n",
+                                ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timeout\n",
                                            __func__, ha->func_num);
                                 timeout = 0;
                         }