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

diff --git a/init/Kconfig b/init/Kconfig
index 4ad6de163238..e63a017c391e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -143,9 +143,7 @@ config POSIX_MQUEUE
           queues every message has a priority which decides about succession
           of receiving it by a process. If you want to compile and run
           programs written e.g. for Solaris with use of its POSIX message
-          queues (functions mq_*) say Y here. To use this feature you will
-          also need mqueue library, available from
-          <http://www.mat.uni.torun.pl/~wrona/posix_ipc/>
+          queues (functions mq_*) say Y here.
 
           POSIX message queues are visible as a filesystem called 'mqueue'
           and can be mounted somewhere if you want to do filesystem
@@ -308,7 +306,7 @@ config SYSFS_DEPRECATED
           releases.
 
           If enabled, this option will also move any device structures
-          that belong to a class, back into the /sys/class heirachy, in
+          that belong to a class, back into the /sys/class hierarchy, in
           order to support older versions of udev.
 
           If you are using a distro that was released in 2006 or later,