Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index 14be0755d7c..847e214ade5 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"