]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Jul 2013 18:40:58 +0000 (11:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Jul 2013 18:40:58 +0000 (11:40 -0700)
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
  ...

23 files changed:
1  2 
Documentation/bcache.txt
Documentation/cgroups/memory.txt
Documentation/devicetree/bindings/clock/silabs,si5351.txt
Documentation/kdump/kdump.txt
Documentation/kernel-per-CPU-kthreads.txt
Documentation/networking/ip-sysctl.txt
Documentation/pinctrl.txt
Documentation/virtual/kvm/api.txt
Documentation/vm/pagemap.txt
Makefile
drivers/cpufreq/s3c2416-cpufreq.c
drivers/media/platform/exynos4-is/Kconfig
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
drivers/misc/mei/hbm.c
drivers/misc/mei/init.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/wireless/ath/ath9k/Kconfig
drivers/usb/musb/omap2430.c
include/linux/cpu.h
include/linux/kernel.h
kernel/irq/generic-chip.c
mm/sparse.c
sound/pci/hda/hda_codec.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc mm/sparse.c
Simple merge
Simple merge