Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
  fix do_sys_open() prototype
  sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
  Documentation: Fix typo in SubmitChecklist.
  Typo: depricated -> deprecated
  Add missing profile=kvm option to Documentation/kernel-parameters.txt
  fix typo about TBI in e1000 comment
  proc.txt: Add /proc/stat field
  small documentation fixes
  Fix compiler warning in smount example program from sharedsubtree.txt
  docs/sysfs: add missing word to sysfs attribute explanation
  documentation/ext3: grammar fixes
  Documentation/java.txt: typo and grammar fixes
  Documentation/filesystems/vfs.txt: typo fix
  include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
  trivial copy_data_pages() tidy up
  Fix typo in arch/x86/kernel/tsc_32.c
  file link fix for Pegasus USB net driver help
  remove unused return within void return function
  Typo fixes retrun -> return
  x86 hpet.h: remove broken links
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 2a2a125b0c76..a592fc04cf78 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -54,7 +54,7 @@ config MTD_PHYSMAP_BANKWIDTH
         help
           This is the total width of the data bus of the flash devices
           in octets. For example, if you have a data bus width of 32
-          bits, you would set the bus width octect value to 4. This is
+          bits, you would set the bus width octet value to 4. This is
           used internally by the CFI drivers.
           Ignore this option if you use run-time physmap configuration
           (i.e., run-time calling physmap_configure()).
@@ -73,12 +73,12 @@ config MTD_PMC_MSP_EVM
         depends on PMC_MSP && MTD_CFI
         select MTD_PARTITIONS
         help
-          This provides a 'mapping' driver which support the way
-          in which user-programmable flash chips are connected on the
-          PMC-Sierra MSP eval/demo boards
+          This provides a 'mapping' driver which supports the way
+          in which user-programmable flash chips are connected on the
+          PMC-Sierra MSP eval/demo boards.
 
 choice
-        prompt "Maximum mappable memory avialable for flash IO"
+        prompt "Maximum mappable memory available for flash IO"
         depends on MTD_PMC_MSP_EVM
         default MSP_FLASH_MAP_LIMIT_32M