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

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
  Jesper Juhl is the new trivial patches maintainer
  Documentation: mention email-clients.txt in SubmittingPatches
  fs/binfmt_elf.c: spello fix
  do_invalidatepage() comment typo fix
  Documentation/filesystems/porting fixes
  typo fixes in net/core/net_namespace.c
  typo fix in net/rfkill/rfkill.c
  typo fixes in net/sctp/sm_statefuns.c
  lib/: Spelling fixes
  kernel/: Spelling fixes
  include/scsi/: Spelling fixes
  include/linux/: Spelling fixes
  include/asm-m68knommu/: Spelling fixes
  include/asm-frv/: Spelling fixes
  fs/: Spelling fixes
  drivers/watchdog/: Spelling fixes
  drivers/video/: Spelling fixes
  drivers/ssb/: Spelling fixes
  drivers/serial/: Spelling fixes
  drivers/scsi/: Spelling fixes
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 8a053ea21e1d..4fa7927997ad 100644
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -1295,8 +1295,8 @@ config SERIAL_NETX_CONSOLE
         depends on SERIAL_NETX
         select SERIAL_CORE_CONSOLE
         help
-          If you have enabled the serial port on the Motorola IMX
-          CPU you can make it the console by answering Y to this option.
+          If you have enabled the serial port on the Hilscher NetX SoC
+          you can make it the console by answering Y to this option.
 
 config SERIAL_OF_PLATFORM
         tristate "Serial port on Open Firmware platform bus"