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, 4 insertions, 4 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 236a79377b8..90e884bb521 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -565,7 +565,7 @@ config CGROUP_MEM_RES_CTLR
         select MM_OWNER
         help
           Provides a memory resource controller that manages both anonymous
-          memory and page cache. (See Documentation/controllers/memory.txt)
+          memory and page cache. (See Documentation/cgroups/memory.txt)
 
           Note that setting this option increases fixed memory overhead
           associated with each page of memory in the system. By this,
@@ -689,7 +689,7 @@ config PID_NS
         depends on NAMESPACES && EXPERIMENTAL
         help
           Support process id namespaces.  This allows having multiple
-          process with the same pid as long as they are in different
+          processes with the same pid as long as they are in different
           pid namespaces.  This is a building block of containers.
 
           Unless you want to work with an experimental feature
@@ -954,7 +954,7 @@ config COMPAT_BRK
           Randomizing heap placement makes heap exploits harder, but it
           also breaks ancient binaries (including anything libc5 based).
           This option changes the bootup default to heap randomization
-          disabled, and can be overriden runtime by setting
+          disabled, and can be overridden at runtime by setting
           /proc/sys/kernel/randomize_va_space to 2.
 
           On non-ancient distros (post-2000 ones) N is usually a safe choice.
@@ -1124,7 +1124,7 @@ config INIT_ALL_POSSIBLE
           cpu_possible_map, some of them chose to initialize cpu_possible_map
           with all 1s, and others with all 0s.  When they were centralised,
           it was better to provide this option than to break all the archs
-          and have several arch maintainers persuing me down dark alleys.
+          and have several arch maintainers pursuing me down dark alleys.
 
 config STOP_MACHINE
         bool