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

5 files changed, 6 insertions, 7 deletions

diff --git a/drivers/media/dvb/cinergyT2/Kconfig b/drivers/media/dvb/cinergyT2/Kconfig
index b5cdd57ec6f5..3d778c5aba68 100644
--- a/drivers/media/dvb/cinergyT2/Kconfig
+++ b/drivers/media/dvb/cinergyT2/Kconfig
@@ -56,7 +56,7 @@ config DVB_CINERGYT2_QUERY_INTERVAL
           measurements.
 
           Please keep in mind that these updates cause traffic on the tuner
-          control bus and thus may or may not affect receiption sensitivity.
+          control bus and thus may or may not affect reception sensitivity.
 
           The default value should be a safe choice for common applications.
 
diff --git a/drivers/media/radio/Kconfig b/drivers/media/radio/Kconfig
index 7015517e2c1b..6d96b17a7f81 100644
--- a/drivers/media/radio/Kconfig
+++ b/drivers/media/radio/Kconfig
@@ -195,8 +195,7 @@ config RADIO_MIROPCM20_RDS
         ---help---
           Choose Y here if you want to see RDS/RBDS information like
           RadioText, Programme Service name, Clock Time and date, Programme
-          TYpe and Traffic Announcement/Programme identification.  You also
-          need to say Y to "miroSOUND PCM20 radio" and devfs!
+          Type and Traffic Announcement/Programme identification.
 
           It's not possible to read the raw RDS packets from the device, so
           the driver cant provide an V4L interface for this.  But the
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 5c53fe62d38b..afb734df6e05 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -353,7 +353,7 @@ config VIDEO_SAA6588
         help
           Support for  Radio Data System (RDS) decoder. This allows seeing
           radio station identification transmitted using this standard.
-          Currentlly, it works only with bt8x8 chips.
+          Currently, it works only with bt8x8 chips.
 
           To compile this driver as a module, choose M here: the
           module will be called saa6588.
diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 51d68f32aa06..0f9d96963618 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -69,6 +69,6 @@ config VIDEO_CX88_VP3054
         depends on VIDEO_CX88_DVB && DVB_MT352
         ---help---
           This adds DVB-T support for cards based on the
-          Connexant 2388x chip and the MT352 demodulator,
+          Conexant 2388x chip and the MT352 demodulator,
           which also require support for the VP-3054
           Secondary I2C bus, such at DNTV Live! DVB-T Pro.
diff --git a/drivers/media/video/pwc/philips.txt b/drivers/media/video/pwc/philips.txt
index 11f751a6bda5..f5e848410311 100644
--- a/drivers/media/video/pwc/philips.txt
+++ b/drivers/media/video/pwc/philips.txt
@@ -175,8 +175,8 @@ dev_hint
    - If a device node is already occupied, registration will fail and
      the webcam is not available.
    - You can have up to 64 video devices; be sure to make enough device
-     nodes in /dev if you want to spread the numbers (this does not apply
-     to devfs). After /dev/video9 comes /dev/video10 (not /dev/videoA).
+     nodes in /dev if you want to spread the numbers.
+     After /dev/video9 comes /dev/video10 (not /dev/videoA).
    - If a camera does not match any dev_hint, it will simply get assigned
      the first available device node, just as it used to be.