Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
  trivial: Update my email address
  trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
  trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
  trivial: Fix misspelling of "Celsius".
  trivial: remove unused variable 'path' in alloc_file()
  trivial: fix a pdlfush -> pdflush typo in comment
  trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
  trivial: wusb: Storage class should be before const qualifier
  trivial: drivers/char/bsr.c: Storage class should be before const qualifier
  trivial: h8300: Storage class should be before const qualifier
  trivial: fix where cgroup documentation is not correctly referred to
  trivial: Give the right path in Documentation example
  trivial: MTD: remove EOL from MODULE_DESCRIPTION
  trivial: Fix typo in bio_split()'s documentation
  trivial: PWM: fix of #endif comment
  trivial: fix typos/grammar errors in Kconfig texts
  trivial: Fix misspelling of firmware
  trivial: cgroups: documentation typo and spelling corrections
  trivial: Update contact info for Jochen Hein
  trivial: fix typo "resgister" -> "register"
  ...

7 files changed, 15 insertions, 15 deletions

diff --git a/net/Kconfig b/net/Kconfig
index ec93e7e38b38..ce77db4fcec8 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -140,7 +140,7 @@ config NETFILTER_ADVANCED
         default y
         help
           If you say Y here you can select between all the netfilter modules.
-          If you say N the more ununsual ones will not be shown and the
+          If you say N the more unusual ones will not be shown and the
           basic ones needed by most people will default to 'M'.
 
           If unsure, say Y.
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ec992159b5f8..ca8cb326d1d2 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -22,17 +22,17 @@ menuconfig IPV6
 if IPV6
 
 config IPV6_PRIVACY
-        bool "IPv6: Privacy Extensions support"
+        bool "IPv6: Privacy Extensions (RFC 3041) support"
         ---help---
           Privacy Extensions for Stateless Address Autoconfiguration in IPv6
-          support.  With this option, additional periodically-alter 
-          pseudo-random global-scope unicast address(es) will assigned to
+          support.  With this option, additional periodically-altered
+          pseudo-random global-scope unicast address(es) will be assigned to
           your interface(s).
         
-          We use our standard pseudo random algorithm to generate randomized
-          interface identifier, instead of one described in RFC 3041.
+          We use our standard pseudo-random algorithm to generate the
+          randomized interface identifier, instead of one described in RFC 3041.
 
-          By default, kernel do not generate temporary addresses.
+          By default the kernel does not generate temporary addresses.
           To use temporary addresses, do
         
                 echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr 
@@ -43,9 +43,9 @@ config IPV6_ROUTER_PREF
         bool "IPv6: Router Preference (RFC 4191) support"
         ---help---
           Router Preference is an optional extension to the Router
-          Advertisement message to improve the ability of hosts
-          to pick more appropriate router, especially when the hosts
-          is placed in a multi-homed network.
+          Advertisement message which improves the ability of hosts
+          to pick an appropriate router, especially when the hosts
+          are placed in a multi-homed network.
 
           If unsure, say N.
 
diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 60c16162474c..f3d9ae350fb6 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -33,7 +33,7 @@ choice
         ---help---
           This option selects the default rate control algorithm
           mac80211 will use. Note that this default can still be
-          overriden through the ieee80211_default_rc_algo module
+          overridden through the ieee80211_default_rc_algo module
           parameter if different algorithms are available.
 
 config MAC80211_RC_DEFAULT_PID
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 2c967e4f706c..bb279bf59a1b 100644
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -52,7 +52,7 @@ config NF_CT_ACCT
 
           Please note that currently this option only sets a default state.
           You may change it at boot time with nf_conntrack.acct=0/1 kernel
-          paramater or by loading the nf_conntrack module with acct=0/1.
+          parameter or by loading the nf_conntrack module with acct=0/1.
 
           You may also disable/enable it on a running system with:
            sysctl net.netfilter.nf_conntrack_acct=0/1
diff --git a/net/phonet/Kconfig b/net/phonet/Kconfig
index 51a5669573f2..6ec7d55b1769 100644
--- a/net/phonet/Kconfig
+++ b/net/phonet/Kconfig
@@ -6,7 +6,7 @@ config PHONET
         tristate "Phonet protocols family"
         help
           The Phone Network protocol (PhoNet) is a packet-oriented
-          communication protocol developped by Nokia for use with its modems.
+          communication protocol developed by Nokia for use with its modems.
 
           This is required for Maemo to use cellular data connectivity (if
           supported). It can also be used to control Nokia phones
diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
index afd91c78ce8e..443c161eb8bd 100644
--- a/net/sunrpc/Kconfig
+++ b/net/sunrpc/Kconfig
@@ -47,7 +47,7 @@ config RPCSEC_GSS_SPKM3
         select CRYPTO_CBC
         help
           Choose Y here to enable Secure RPC using the SPKM3 public key
-          GSS-API mechansim (RFC 2025).
+          GSS-API mechanism (RFC 2025).
 
           Secure RPC calls with SPKM3 require an auxiliary userspace
           daemon which may be found in the Linux nfs-utils package
diff --git a/net/wimax/Kconfig b/net/wimax/Kconfig
index 18495cdcd10d..1b46747a5f5a 100644
--- a/net/wimax/Kconfig
+++ b/net/wimax/Kconfig
@@ -8,7 +8,7 @@
 #
 # As well, enablement of the RFKILL code means we need the INPUT layer
 # support to inject events coming from hw rfkill switches. That
-# dependency could be killed if input.h provided appropiate means to
+# dependency could be killed if input.h provided appropriate means to
 # work when input is disabled.
 
 comment "WiMAX Wireless Broadband support requires CONFIG_INPUT enabled"