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

Pull trivial tree from Jiri Kosina:
 "It's indeed trivial -- mostly documentation updates and a bunch of
  typo fixes from Masanari.

  There are also several linux/version.h include removals from Jesper."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)
  kcore: fix spelling in read_kcore() comment
  constify struct pci_dev * in obvious cases
  Revert "char: Fix typo in viotape.c"
  init: fix wording error in mm_init comment
  usb: gadget: Kconfig: fix typo for 'different'
  Revert "power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c"
  writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header
  writeback: fix typo in the writeback_control comment
  Documentation: Fix multiple typo in Documentation
  tpm_tis: fix tis_lock with respect to RCU
  Revert "media: Fix typo in mixer_drv.c and hdmi_drv.c"
  Doc: Update numastat.txt
  qla4xxx: Add missing spaces to error messages
  compiler.h: Fix typo
  security: struct security_operations kerneldoc fix
  Documentation: broken URL in libata.tmpl
  Documentation: broken URL in filesystems.tmpl
  mtd: simplify return logic in do_map_probe()
  mm: fix comment typo of truncate_inode_pages_range
  power: bq27x00: Fix typos in comment
  ...

2 files changed, 2 insertions, 2 deletions

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index e29e0ca32f74..8d6d9702d1ec 100644
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -826,7 +826,7 @@ static void rds_ib_process_recv(struct rds_connection *conn,
 
         if (data_len < sizeof(struct rds_header)) {
                 rds_ib_conn_error(conn, "incoming message "
-                       "from %pI4 didn't inclue a "
+                       "from %pI4 didn't include a "
                        "header, disconnecting and "
                        "reconnecting\n",
                        &conn->c_faddr);
diff --git a/net/rds/iw_recv.c b/net/rds/iw_recv.c
index 5e57347f49ff..3c8717005018 100644
--- a/net/rds/iw_recv.c
+++ b/net/rds/iw_recv.c
@@ -661,7 +661,7 @@ static void rds_iw_process_recv(struct rds_connection *conn,
 
         if (byte_len < sizeof(struct rds_header)) {
                 rds_iw_conn_error(conn, "incoming message "
-                       "from %pI4 didn't inclue a "
+                       "from %pI4 didn't include a "
                        "header, disconnecting and "
                        "reconnecting\n",
                        &conn->c_faddr);