From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Mar 2012 04:12:50 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: v3.4-rc1~175
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=69a7aebcf019ab3ff5764525ad6858fbe23bb86d;p=~emulex%2Finfiniband.git

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
  ...
---

69a7aebcf019ab3ff5764525ad6858fbe23bb86d
diff --cc arch/arm/mach-bcmring/dma.c
index 1024396797e,8751582a6cb..e5fd241fccd
--- a/arch/arm/mach-bcmring/dma.c
+++ b/arch/arm/mach-bcmring/dma.c
@@@ -33,11 -33,16 +33,10 @@@
  
  #include <mach/timer.h>
  
 -#include <linux/mm.h>
  #include <linux/pfn.h>
  #include <linux/atomic.h>
- #include <linux/sched.h>
  #include <mach/dma.h>
  
 -/* I don't quite understand why dc4 fails when this is set to 1 and DMA is enabled */
 -/* especially since dc4 doesn't use kmalloc'd memory. */
 -
 -#define ALLOW_MAP_OF_KMALLOC_MEMORY 0
 -
  /* ---- Public Variables ------------------------------------------------- */
  
  /* ---- Private Constants and Types -------------------------------------- */
diff --cc drivers/block/nvme.c
index 1f3c1a7d132,09776daf98e..38a2d063188
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@@ -39,10 -39,7 +39,9 @@@
  #include <linux/sched.h>
  #include <linux/slab.h>
  #include <linux/types.h>
- #include <linux/version.h>
  
 +#include <asm-generic/io-64-nonatomic-lo-hi.h>
 +
  #define NVME_Q_DEPTH 1024
  #define SQ_SIZE(depth)		(depth * sizeof(struct nvme_command))
  #define CQ_SIZE(depth)		(depth * sizeof(struct nvme_completion))