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

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index d926272a40db..653098bc2dd5 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -121,7 +121,7 @@ config SERIAL_8250_RUNTIME_UARTS
         default "4"
         help
           Set this to the maximum number of serial ports you want
-          the kernel to register at boot time.  This can be overriden
+          the kernel to register at boot time.  This can be overridden
           with the module parameter "nr_uarts", or boot-time parameter
           8250.nr_uarts
 
@@ -205,7 +205,7 @@ config SERIAL_8250_BOCA
         depends on SERIAL_8250 != n && ISA && SERIAL_8250_MANY_PORTS
         help
           Say Y here if you have a Boca serial board.  Please read the Boca
-          mini-HOWTO, avaialble from <http://www.tldp.org/docs.html#howto>
+          mini-HOWTO, available from <http://www.tldp.org/docs.html#howto>
 
           To compile this driver as a module, choose M here: the module
           will be called 8250_boca.
@@ -667,7 +667,7 @@ config SERIAL_68328
         depends on M68328 || M68EZ328 || M68VZ328
         help
           This driver supports the built-in serial port of the Motorola 68328
-          (standard, EZ and VZ varities).
+          (standard, EZ and VZ varieties).
 
 config SERIAL_68328_RTS_CTS
         bool "Support RTS/CTS on 68328 serial port"