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

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 137e993f4329..12b3b24bfd2f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -355,9 +355,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
         clock=          [BUGS=IA-32, HW] gettimeofday clocksource override.
                         [Deprecated]
-                        Forces specified clocksource (if avaliable) to be used
+                        Forces specified clocksource (if available) to be used
                         when calculating gettimeofday(). If specified
-                        clocksource is not avalible, it defaults to PIT.
+                        clocksource is not available, it defaults to PIT.
                         Format: { pit | tsc | cyclone | pmtmr }
 
         disable_8254_timer
@@ -611,8 +611,8 @@ and is between 256 and 4096 characters. It is defined in the file
         noirqbalance    [IA-32,SMP,KNL] Disable kernel irq balancing
 
         i8042.direct    [HW] Put keyboard port into non-translated mode
-        i8042.dumbkbd   [HW] Pretend that controlled can only read data from
-                             keyboard and can not control its state
+        i8042.dumbkbd   [HW] Pretend that controller can only read data from
+                             keyboard and cannot control its state
                              (Don't attempt to blink the leds)
         i8042.noaux     [HW] Don't check for auxiliary (== mouse) port
         i8042.nokbd     [HW] Don't check/create keyboard port
@@ -1368,7 +1368,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
         reboot=         [BUGS=IA-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
                         Format: <reboot_mode>[,<reboot_mode2>[,...]]
-                        See arch/*/kernel/reboot.c.
+                        See arch/*/kernel/reboot.c or arch/*/kernel/process.c                   
 
         reserve=        [KNL,BUGS] Force the kernel to ignore some iomem area