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

diff --git a/MAINTAINERS b/MAINTAINERS
index 41a4b477c576..3b46f43c338b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1038,6 +1038,8 @@ S:	Maintained
 CONEXANT ACCESSRUNNER USB DRIVER
 P:      Simon Arlott
 M:      cxacru@fire.lp0.eu
+L:      accessrunner-general@lists.sourceforge.net
+W:      http://accessrunner.sourceforge.net/
 S:      Maintained
 
 CORETEMP HARDWARE MONITORING DRIVER
@@ -2800,7 +2802,7 @@ L:	linux-abi-devel@lists.sourceforge.net
 S:      Maintained
 
 PHRAM MTD DRIVER
-P:      Jörn Engel
+P:      Jörn Engel
 M:      joern@wh.fh-wedel.de
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
@@ -3074,7 +3076,7 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 S:      Maintained
 
 SCSI TAPE DRIVER
-P:      Kai Mäkisara
+P:      Kai Mäkisara
 M:      Kai.Makisara@kolumbus.fi
 L:      linux-scsi@vger.kernel.org
 S:      Maintained