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

Pull the trivial tree from Jiri Kosina:
 "Tiny usual fixes all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  doc: fix old config name of kprobetrace
  fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc
  btrfs: fix the commment for the action flags in delayed-ref.h
  btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID
  vfs: fix kerneldoc for generic_fh_to_parent()
  treewide: fix comment/printk/variable typos
  ipr: fix small coding style issues
  doc: fix broken utf8 encoding
  nfs: comment fix
  platform/x86: fix asus_laptop.wled_type module parameter
  mfd: printk/comment fixes
  doc: getdelays.c: remember to close() socket on error in create_nl_socket()
  doc: aliasing-test: close fd on write error
  mmc: fix comment typos
  dma: fix comments
  spi: fix comment/printk typos in spi
  Coccinelle: fix typo in memdup_user.cocci
  tmiofb: missing NULL pointer checks
  tools: perf: Fix typo in tools/perf
  tools/testing: fix comment / output typos
  ...

diff --cc Documentation/dontdiff
Simple merge

diff --cc drivers/dma/at_hdmac.c
Simple merge

diff --cc drivers/dma/imx-dma.c
Simple merge

diff --cc drivers/dma/pl330.c
Simple merge

diff --cc drivers/mfd/ab8500-gpadc.c
Simple merge

diff --cc drivers/mfd/rc5t583.c
Simple merge

diff --cc drivers/mfd/rdc321x-southbridge.c
Simple merge

diff --cc drivers/mmc/host/atmel-mci.c
Simple merge

diff --cc drivers/mmc/host/omap_hsmmc.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
Simple merge

diff --cc drivers/scsi/bfa/bfa_ioc.c
Simple merge

diff --cc drivers/scsi/bnx2fc/bnx2fc_fcoe.c
Simple merge

diff --cc drivers/scsi/isci/init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_sli.c
Simple merge

diff --cc drivers/scsi/megaraid.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_os.c
Simple merge

diff --cc drivers/video/exynos/exynos_mipi_dsi.c
Simple merge

diff --cc drivers/w1/masters/ds1wm.c
Simple merge

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/delayed-ref.h
Simple merge

diff --cc fs/btrfs/inode.c
Simple merge

diff --cc fs/ext2/balloc.c
Simple merge

diff --cc fs/ext3/balloc.c
Simple merge

diff --cc fs/ext3/inode.c
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/mballoc.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc fs/nfs/super.c
Simple merge

diff --cc include/linux/irqdesc.h
Simple merge

diff --cc tools/perf/util/parse-events-test.c
Simple merge

diff --cc tools/perf/util/python-ext-sources
Simple merge