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

3 files changed, 4 insertions, 4 deletions

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 67519ef0ef95..271263443c37 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -32,7 +32,7 @@ config JOYSTICK_ANALOG
           module will be called analog.
 
 config JOYSTICK_A3D
-        tristate "Assasin 3D and MadCatz Panther devices"
+        tristate "Assassin 3D and MadCatz Panther devices"
         select GAMEPORT
         help
           Say Y here if you have an FPGaming or MadCatz controller using the
diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62e00c79dec..679bde34d247 100644
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -177,7 +177,7 @@ config KEYBOARD_HIL_OLD
           However, it has been thoroughly tested and is stable.
 
           If you want full HIL support including support for multiple
-          keyboards, mices and tablets, you have to enable the
+          keyboards, mice, and tablets, you have to enable the
           "HP System Device Controller i8042 Support" in the input/serio
           submenu.
 
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 98acf170252c..8cdbfeca5903 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -115,9 +115,9 @@ config HP_SDC
         depends on GSC && SERIO
         default y
         ---help---
-          This option enables supports for the the "System Device
+          This option enables support for the "System Device
           Controller", an i8042 carrying microcode to manage a
-          few miscellanous devices on some Hewlett Packard systems.
+          few miscellaneous devices on some Hewlett Packard systems.
           The SDC itself contains a 10ms resolution timer/clock capable
           of delivering interrupts on a periodic and one-shot basis.
           The SDC may also be connected to a battery-backed real-time