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

4 files changed, 7 insertions, 7 deletions

diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 30af4a4dfcc8..d172a9804448 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -64,7 +64,7 @@ config ASK_IP_FIB_HASH
 config IP_FIB_TRIE
         bool "FIB_TRIE"
         ---help---
-        Use new experimental LC-trie as FIB lookup algoritm. 
+        Use new experimental LC-trie as FIB lookup algorithm. 
         This improves lookup performance if you have a large
         number of routes.
 
@@ -526,7 +526,7 @@ config TCP_CONG_HYBLA
         ---help---
         TCP-Hybla is a sender-side only change that eliminates penalization of
         long-RTT, large-bandwidth connections, like when satellite legs are
-        involved, expecially when sharing a common bottleneck with normal
+        involved, especially when sharing a common bottleneck with normal
         terrestrial connections.
 
 config TCP_CONG_VEGAS
@@ -556,7 +556,7 @@ config TCP_CONG_LP
         default n
         ---help---
         TCP Low Priority (TCP-LP), a distributed algorithm whose goal is
-        to utiliza only the excess network bandwidth as compared to the
+        to utilize only the excess network bandwidth as compared to the
         ``fair share`` of bandwidth as targeted by TCP.
         See http://www-ece.rice.edu/networks/TCP-LP/
 
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index cfe5c8474286..cfb5d3de9c84 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1,4 +1,4 @@
-/* linux/net/inet/arp.c
+/* linux/net/ipv4/arp.c
  *
  * Version:     $Id: arp.c,v 1.99 2001/08/30 22:55:42 davem Exp $
  *
diff --git a/net/ipv4/ipvs/Kconfig b/net/ipv4/ipvs/Kconfig
index c9820bfc493a..891b9355cf96 100644
--- a/net/ipv4/ipvs/Kconfig
+++ b/net/ipv4/ipvs/Kconfig
@@ -81,7 +81,7 @@ config	IP_VS_PROTO_ESP
         bool "ESP load balancing support"
         depends on IP_VS
         ---help---
-          This option enables support for load balancing ESP (Encapsultion
+          This option enables support for load balancing ESP (Encapsulation
           Security Payload) transport protocol. Say Y if unsure.
 
 config  IP_VS_PROTO_AH
@@ -204,7 +204,7 @@ config	IP_VS_SED
           connections to the server with the shortest expected delay. The 
           expected delay that the job will experience is (Ci + 1) / Ui if 
           sent to the ith server, in which Ci is the number of connections
-          on the the ith server and Ui is the fixed service rate (weight)
+          on the ith server and Ui is the fixed service rate (weight)
           of the ith server.
 
           If you want to compile it in kernel, say Y. To compile it as a
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index a55b8ff70ded..d88c292f118c 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -373,7 +373,7 @@ config IP_NF_TARGET_ULOG
           daemon using netlink multicast sockets; unlike the LOG target
           which can only be viewed through syslog.
 
-          The apropriate userspace logging daemon (ulogd) may be obtained from
+          The appropriate userspace logging daemon (ulogd) may be obtained from
           <http://www.gnumonks.org/projects/ulogd/>
 
           To compile it as a module, choose M here.  If unsure, say N.