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"
  ...

1 files changed, 9 insertions, 9 deletions

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.