Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Linus Torvalds [Wed, 21 Mar 2012 04:12:50 +0000 (21:12 -0700)]
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
  ...

22 files changed:
1  2 
Documentation/hwmon/zl6100
Documentation/input/alps.txt
Documentation/kernel-parameters.txt
arch/arm/mach-bcmring/dma.c
drivers/block/nvme.c
drivers/gpu/drm/radeon/rv515.c
drivers/infiniband/ulp/srpt/ib_srpt.c
drivers/iommu/intel-iommu.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/power/bq27x00_battery.c
drivers/scsi/isci/host.c
drivers/scsi/qla2xxx/qla_bsg.c
drivers/tty/synclink_gt.c
fs/btrfs/check-integrity.c
fs/btrfs/free-space-cache.c
fs/fs-writeback.c
include/linux/pci.h
include/trace/events/power.h
init/main.c
sound/pci/hda/patch_conexant.c
tools/testing/ktest/ktest.pl

Simple merge
Simple merge
Simple merge
  
  #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 -------------------------------------- */
  #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))
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
Simple merge
Simple merge