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

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index dab082002e6f..c6dfb6fa13bf 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -40,10 +40,10 @@ config SCSI_PROC_FS
         default y
         ---help---
           This option enables support for the various files in
-          /proc/scsi.  In Linux 2.6 this has been superceeded by
+          /proc/scsi.  In Linux 2.6 this has been superseded by
           files in sysfs but many legacy applications rely on this.
 
-          If unusure say Y.
+          If unsure say Y.
 
 comment "SCSI support type (disk, tape, CD-ROM)"
         depends on SCSI
@@ -85,7 +85,7 @@ config CHR_DEV_OSST
         tristate "SCSI OnStream SC-x0 tape support"
         depends on SCSI
         ---help---
-          The OnStream SC-x0 SCSI tape drives can not be driven by the
+          The OnStream SC-x0 SCSI tape drives cannot be driven by the
           standard st driver, but instead need this special osst driver and
           use the  /dev/osstX char device nodes (major 206).  Via usb-storage
           and ide-scsi, you may be able to drive the USB-x0 and DI-x0 drives
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx
index 7955ebe8e1e8..911ea1756e55 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic79xx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx
@@ -22,12 +22,12 @@ config AIC79XX_CMDS_PER_DEVICE
         to be used for any device.  The aic7xxx driver will automatically
         vary this number based on device behavior.  For devices with a
         fixed maximum, the driver will eventually lock to this maximum
-        and display a console message inidicating this value.
+        and display a console message indicating this value.
 
         Due to resource allocation issues in the Linux SCSI mid-layer, using
         a high number of commands per device may result in memory allocation
         failures when many devices are attached to the system.  For this reason,
-        the default is set to 32.  Higher values may result in higer performance
+        the default is set to 32.  Higher values may result in higher performance
         on some devices.  The upper bound is 253.  0 disables tagged queueing.
 
         Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic7xxx b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
index 5517da5855f0..cd93f9a8611f 100644
--- a/drivers/scsi/aic7xxx/Kconfig.aic7xxx
+++ b/drivers/scsi/aic7xxx/Kconfig.aic7xxx
@@ -27,12 +27,12 @@ config AIC7XXX_CMDS_PER_DEVICE
         to be used for any device.  The aic7xxx driver will automatically
         vary this number based on device behavior.  For devices with a
         fixed maximum, the driver will eventually lock to this maximum
-        and display a console message inidicating this value.
+        and display a console message indicating this value.
 
         Due to resource allocation issues in the Linux SCSI mid-layer, using
         a high number of commands per device may result in memory allocation
         failures when many devices are attached to the system.  For this reason,
-        the default is set to 32.  Higher values may result in higer performance
+        the default is set to 32.  Higher values may result in higher performance
         on some devices.  The upper bound is 253.  0 disables tagged queueing.
 
         Per device tag depth can be controlled via the kernel command line
diff --git a/drivers/scsi/arm/arxescsi.c b/drivers/scsi/arm/arxescsi.c
index a28940156703..4385e9e3ded6 100644
--- a/drivers/scsi/arm/arxescsi.c
+++ b/drivers/scsi/arm/arxescsi.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/drivers/scsi/arxescsi.c
+ * linux/drivers/scsi/arm/arxescsi.c
  *
  * Copyright (C) 1997-2000 Russell King, Stefan Hanske
  *