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

Pull trivial tree updates from Jiri Kosina:
 "The usual stuff from trivial tree"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)
  treewide: relase -> release
  Documentation/cgroups/memory.txt: fix stat file documentation
  sysctl/net.txt: delete reference to obsolete 2.4.x kernel
  spinlock_api_smp.h: fix preprocessor comments
  treewide: Fix typo in printk
  doc: device tree: clarify stuff in usage-model.txt.
  open firmware: "/aliasas" -> "/aliases"
  md: bcache: Fixed a typo with the word 'arithmetic'
  irq/generic-chip: fix a few kernel-doc entries
  frv: Convert use of typedef ctl_table to struct ctl_table
  sgi: xpc: Convert use of typedef ctl_table to struct ctl_table
  doc: clk: Fix incorrect wording
  Documentation/arm/IXP4xx fix a typo
  Documentation/networking/ieee802154 fix a typo
  Documentation/DocBook/media/v4l fix a typo
  Documentation/video4linux/si476x.txt fix a typo
  Documentation/virtual/kvm/api.txt fix a typo
  Documentation/early-userspace/README fix a typo
  Documentation/video4linux/soc-camera.txt fix a typo
  lguest: fix CONFIG_PAE -> CONFIG_x86_PAE in comment
  ...

diff --cc Documentation/bcache.txt
Simple merge

diff --cc Documentation/cgroups/memory.txt
Simple merge

diff --cc Documentation/devicetree/bindings/clock/silabs,si5351.txt
Simple merge

diff --cc Documentation/kdump/kdump.txt
Simple merge

diff --cc Documentation/kernel-per-CPU-kthreads.txt
Simple merge

diff --cc Documentation/networking/ip-sysctl.txt
Simple merge

diff --cc Documentation/pinctrl.txt
Simple merge

diff --cc Documentation/virtual/kvm/api.txt
Simple merge

diff --cc Documentation/vm/pagemap.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc drivers/cpufreq/s3c2416-cpufreq.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/Kconfig
Simple merge

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
Simple merge

diff --cc drivers/misc/mei/hbm.c
Simple merge

diff --cc drivers/misc/mei/init.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/Kconfig
Simple merge

diff --cc drivers/usb/musb/omap2430.c
Simple merge

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

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

diff --cc kernel/irq/generic-chip.c
Simple merge

diff --cc mm/sparse.c
Simple merge

diff --cc sound/pci/hda/hda_codec.c
Simple merge