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: (39 commits)
  b43: fix comment typo reqest -> request
  Haavard Skinnemoen has left Atmel
  cris: typo in mach-fs Makefile
  Kconfig: fix copy/paste-ism for dell-wmi-aio driver
  doc: timers-howto: fix a typo ("unsgined")
  perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
  md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
  treewide: fix a few typos in comments
  regulator: change debug statement be consistent with the style of the rest
  Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
  audit: acquire creds selectively to reduce atomic op overhead
  rtlwifi: don't touch with treewide double semicolon removal
  treewide: cleanup continuations and remove logging message whitespace
  ath9k_hw: don't touch with treewide double semicolon removal
  include/linux/leds-regulator.h: fix syntax in example code
  tty: fix typo in descripton of tty_termios_encode_baud_rate
  xtensa: remove obsolete BKL kernel option from defconfig
  m68k: fix comment typo 'occcured'
  arch:Kconfig.locks Remove unused config option.
  treewide: remove extra semicolons
  ...

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/target/target_core_alua.c b/drivers/target/target_core_alua.c
index 30cbb743d9ba..47abb42d9c36 100644
--- a/drivers/target/target_core_alua.c
+++ b/drivers/target/target_core_alua.c
@@ -1036,7 +1036,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group)
         lu_gp = kmem_cache_zalloc(t10_alua_lu_gp_cache, GFP_KERNEL);
         if (!(lu_gp)) {
                 printk(KERN_ERR "Unable to allocate struct t10_alua_lu_gp\n");
-                return ERR_PTR(-ENOMEM);;
+                return ERR_PTR(-ENOMEM);
         }
         INIT_LIST_HEAD(&lu_gp->lu_gp_list);
         INIT_LIST_HEAD(&lu_gp->lu_gp_mem_list);
@@ -1044,7 +1044,7 @@ core_alua_allocate_lu_gp(const char *name, int def_group)
         atomic_set(&lu_gp->lu_gp_ref_cnt, 0);
 
         if (def_group) {
-                lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;;
+                lu_gp->lu_gp_id = se_global->alua_lu_gps_counter++;
                 lu_gp->lu_gp_valid_id = 1;
                 se_global->alua_lu_gps_count++;
         }
diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
index 9583b23c9c84..b9d3501bdd91 100644
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@ -2128,7 +2128,7 @@ static void transport_failure_reset_queue_depth(struct se_device *dev)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);;
+        spin_lock_irqsave(&SE_HBA(dev)->hba_queue_lock, flags);
         atomic_inc(&dev->depth_left);
         atomic_inc(&SE_HBA(dev)->left_queue_depth);
         spin_unlock_irqrestore(&SE_HBA(dev)->hba_queue_lock, flags);