Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
  sound: convert "sound" subdirectory to UTF-8
  MAINTAINERS: Add cxacru website/mailing list
  include files: convert "include" subdirectory to UTF-8
  general: convert "kernel" subdirectory to UTF-8
  documentation: convert the Documentation directory to UTF-8
  Convert the toplevel files CREDITS and MAINTAINERS to UTF-8.
  remove broken URLs from net drivers' output
  Magic number prefix consistency change to Documentation/magic-number.txt
  trivial: s/i_sem /i_mutex/
  fix file specification in comments
  drivers/base/platform.c: fix small typo in doc
  misc doc and kconfig typos
  Remove obsolete fat_cvf help text
  Fix occurrences of "the the "
  Fix minor typoes in kernel/module.c
  Kconfig: Remove reference to external mqueue library
  Kconfig: A couple of grammatical fixes in arch/i386/Kconfig
  Correct comments in genrtc.c to refer to correct /proc file.
  Fix more "deprecated" spellos.
  Fix "deprecated" typoes.
  ...

Fix trivial comment conflict in kernel/relay.c.

1 files changed, 2 insertions, 2 deletions

diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index 0b46a5dff4c0..c64ce9c14207 100644
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -23,7 +23,7 @@ config PREEMPT_VOLUNTARY
           "explicit preemption points" to the kernel code. These new
           preemption points have been selected to reduce the maximum
           latency of rescheduling, providing faster application reactions,
-          at the cost of slighly lower throughput.
+          at the cost of slightly lower throughput.
 
           This allows reaction to interactive events by allowing a
           low priority process to voluntarily preempt itself even if it
@@ -43,7 +43,7 @@ config PREEMPT
           even if it is in kernel mode executing a system call and would
           otherwise not be about to reach a natural preemption point.
           This allows applications to run more 'smoothly' even when the
-          system is under load, at the cost of slighly lower throughput
+          system is under load, at the cost of slightly lower throughput
           and a slight runtime overhead to kernel code.
 
           Select this if you are building a kernel for a desktop or