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

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
  Add missing maintainer countries in CREDITS
  Fix bytes <-> kilobytes  typo in Kconfig for ramdisk
  fix a typo in Documentation/pi-futex.txt
  BUG_ON conversion for fs/xfs/
  BUG_ON() conversion in fs/nfsd/
  BUG_ON conversion for fs/reiserfs
  BUG_ON cleanups in arch/i386
  BUG_ON cleanup in drivers/net/tokenring/
  BUG_ON cleanup for drivers/md/
  kerneldoc-typo in led-class.c
  debugfs: spelling fix
  rcutorture: Fix incorrect description of default for nreaders parameter
  parport: Remove space in function calls
  Michal Wronski: update contact info
  Spelling fix: "control" instead of "cotrol"
  reboot parameter in Documentation/kernel-parameters.txt
  Fix copy&waste bug in comment in scripts/kernel-doc
  remove duplicate "until" from kernel/workqueue.c
  ite_gpio fix tabbage
  fix file specification in comments
  ...

Fixed trivial path conflicts due to removed files:
   arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c

1 files changed, 8 insertions, 8 deletions

diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index c96897aa08b6..0cf654147634 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -148,7 +148,7 @@ NEW IN THIS RELEASE
                 for async connections.
 
         o Added the PPPCONFIG utility
-                Used to configure the PPPD dameon for the
+                Used to configure the PPPD daemon for the
                 WANPIPE Async PPP and standard serial port.
                 The wancfg calls the pppconfig to configure
                 the pppd.
@@ -214,7 +214,7 @@ PRODUCT COMPONENTS AND RELATED FILES
 /usr/local/wanrouter/patches/kdrivers:
         Sources of the latest WANPIPE device drivers.
         These are used to UPGRADE the linux kernel to the newest
-        version if the kernel source has already been pathced with
+        version if the kernel source has already been patched with
         WANPIPE drivers.
 
 /usr/local/wanrouter/samples:
@@ -350,7 +350,7 @@ REVISION HISTORY
                                  Available as a patch.                 
 
 2.0.6   Aug 17, 1999            Increased debugging in statup scripts
-                                Fixed insallation bugs from 2.0.5
+                                Fixed installation bugs from 2.0.5
                                 Kernel patch works for both 2.2.10 and 2.2.11 kernels.
                                 There is no functional difference between the two packages         
 
@@ -434,11 +434,11 @@ beta3-2.1.4 Jul 2000		o X25 M_BIT Problem fix.
                                   change. 
           
 beta1-2.1.5     Nov 15 2000
-                                o Fixed the MulitPort PPP Support for kernels 2.2.16 and above.
+                                o Fixed the MultiPort PPP Support for kernels 2.2.16 and above.
                                   2.2.X kernels only
 
                                 o Secured the driver UDP debugging calls
-                                        - All illegal netowrk debugging calls are reported to
+                                        - All illegal network debugging calls are reported to
                                           the log.
                                         - Defined a set of allowed commands, all other denied.
                                         
@@ -451,7 +451,7 @@ beta1-2.1.5 	Nov 15 2000
 
                                 o Keyboard Led Monitor/Debugger
                                         - A new utilty /usr/sbin/wpkbdmon uses keyboard leds
-                                          to convey operatinal statistic information of the 
+                                          to convey operational statistic information of the 
                                           Sangoma WANPIPE cards.
                                         NUM_LOCK    = Line State  (On=connected,    Off=disconnected)
                                         CAPS_LOCK   = Tx data     (On=transmitting, Off=no tx data)
@@ -470,7 +470,7 @@ beta1-2.1.5 	Nov 15 2000
                                 o Fixed the Frame Relay and Chdlc network interfaces so they are
                                   compatible with libpcap libraries.  Meaning, tcpdump, snort,
                                   ethereal, and all other packet sniffers and debuggers work on
-                                  all WANPIPE netowrk interfaces.
+                                  all WANPIPE network interfaces.
                                         - Set the network interface encoding type to ARPHRD_PPP.
                                           This tell the sniffers that data obtained from the
                                           network interface is in pure IP format.
@@ -570,7 +570,7 @@ bata1-2.2.1	Feb 09 2001
 
                                 Option to COMPILE WANPIPE modules against the currently 
                                 running kernel, thus no need for manual kernel and module
-                                re-compilatin.
+                                re-compilation.
                         
                         o Updates and Bug Fixes to wancfg utility.