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

1 files changed, 4 insertions, 4 deletions

diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index c0e1a0f52462..2d3373b2e256 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -280,7 +280,7 @@ static ssize_t sel_write_disable(struct file *file, const char __user *buf,
 
         length = -ENOMEM;
         if (count >= PAGE_SIZE)
-                goto out;;
+                goto out;
 
         /* No partial writes. */
         length = -EINVAL;
@@ -876,12 +876,12 @@ static ssize_t sel_write_user(struct file *file, char *buf, size_t size)
 
         length = task_has_security(current, SECURITY__COMPUTE_USER);
         if (length)
-                goto out;;
+                goto out;
 
         length = -ENOMEM;
         con = kzalloc(size + 1, GFP_KERNEL);
         if (!con)
-                goto out;;
+                goto out;
 
         length = -ENOMEM;
         user = kzalloc(size + 1, GFP_KERNEL);
@@ -941,7 +941,7 @@ static ssize_t sel_write_member(struct file *file, char *buf, size_t size)
         length = -ENOMEM;
         scon = kzalloc(size + 1, GFP_KERNEL);
         if (!scon)
-                goto out;;
+                goto out;
 
         length = -ENOMEM;
         tcon = kzalloc(size + 1, GFP_KERNEL);