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

Pull trivial updates from Jiri Kosina:
 "As usual, it's mostly typo fixes, redundant code elimination and some
  documentation updates."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (57 commits)
  edac, mips: don't change code that has been removed in edac/mips tree
  xtensa: Change mail addresses of Hannes Weiner and Oskar Schirmer
  lib: Change mail address of Oskar Schirmer
  net: Change mail address of Oskar Schirmer
  arm/m68k: Change mail address of Sebastian Hess
  i2c: Change mail address of Oskar Schirmer
  net: Fix tcp_build_and_update_options comment in struct tcp_sock
  atomic64_32.h: fix parameter naming mismatch
  Kconfig: replace "--- help ---" with "---help---"
  c2port: fix bogus Kconfig "default no"
  edac: Fix spelling errors.
  qla1280: Remove redundant NULL check before release_firmware() call
  remoteproc: remove redundant NULL check before release_firmware()
  qla2xxx: Remove redundant NULL check before release_firmware() call.
  aic94xx: Get rid of redundant NULL check before release_firmware() call
  tehuti: delete redundant NULL check before release_firmware()
  qlogic: get rid of a redundant test for NULL before call to release_firmware()
  bna: remove redundant NULL test before release_firmware()
  tg3: remove redundant NULL test before release_firmware() call
  typhoon: get rid of redundant conditional before all to release_firmware()
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 49ef8b0794ae..220686159c15 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -417,7 +417,7 @@ config MFD_MAX8925
         select MFD_CORE
         help
           Say yes here to support for Maxim Semiconductor MAX8925. This is
-          a Power Management IC. This driver provies common support for
+          a Power Management IC. This driver provides common support for
           accessing the device, additional drivers must be enabled in order
           to use the functionality of the device.
 
@@ -440,7 +440,7 @@ config MFD_MAX8998
         help
           Say yes here to support for Maxim Semiconductor MAX8998 and
           National Semiconductor LP3974. This is a Power Management IC.
-          This driver provies common support for accessing the device,
+          This driver provides common support for accessing the device,
           additional drivers must be enabled in order to use the functionality
           of the device.
 
@@ -451,7 +451,7 @@ config MFD_S5M_CORE
         select REGMAP_I2C
         help
          Support for the Samsung Electronics S5M MFD series.
-         This driver provies common support for accessing the device,
+         This driver provides common support for accessing the device,
          additional drivers must be enabled in order to use the functionality
          of the device