Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)
  tree-wide: fix misspelling of "definition" in comments
  reiserfs: fix misspelling of "journaled"
  doc: Fix a typo in slub.txt.
  inotify: remove superfluous return code check
  hdlc: spelling fix in find_pvc() comment
  doc: fix regulator docs cut-and-pasteism
  mtd: Fix comment in Kconfig
  doc: Fix IRQ chip docs
  tree-wide: fix assorted typos all over the place
  drivers/ata/libata-sff.c: comment spelling fixes
  fix typos/grammos in Documentation/edac.txt
  sysctl: add missing comments
  fs/debugfs/inode.c: fix comment typos
  sgivwfb: Make use of ARRAY_SIZE.
  sky2: fix sky2_link_down copy/paste comment error
  tree-wide: fix typos "couter" -> "counter"
  tree-wide: fix typos "offest" -> "offset"
  fix kerneldoc for set_irq_msi()
  spidev: fix double "of of" in comment
  comment typo fix: sybsystem -> subsystem
  ...

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 14be0755d7cd..847e214ade59 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -1,5 +1,3 @@
-# drivers/mtd/maps/Kconfig
-
 menu "Mapping drivers for chip access"
         depends on MTD!=n
 
@@ -389,9 +387,9 @@ config MTD_IXP2000
         depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP2000
         help
           This enables MTD access to flash devices on platforms based
-          on Intel's IXP2000 family of network processors such as the
-          IXDP425 and Coyote. If you have an IXP2000 based board and
-          would like to use the flash chips on it, say 'Y'.
+          on Intel's IXP2000 family of network processors. If you have an
+          IXP2000 based board and would like to use the flash chips on it,
+          say 'Y'.
 
 config MTD_FORTUNET
         tristate "CFI Flash device mapped on the FortuNet board"