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/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index 07dd6d9930a1..bc2ab419a74a 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -335,7 +335,7 @@ REVISION HISTORY
                                 creating applications using BiSync
                                 streaming.        
 
-2.0.5   Aug 04, 1999            CHDLC initializatin bug fix.
+2.0.5   Aug 04, 1999            CHDLC initialization bug fix.
                                 PPP interrupt driven driver: 
                                 Fix to the PPP line hangup problem.
                                 New PPP firmware
@@ -372,7 +372,7 @@ REVISION HISTORY
                                 o cfgft1 GUI csu/dsu configurator
                                 o wancfg GUI configuration file 
                                   configurator.
-                                o Architectual directory changes.
+                                o Architectural directory changes.
 
 beta-2.1.4 Jul 2000             o Dynamic interface configuration:
                                         Network interfaces reflect the state