Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2014 15:50:34 +0000 (08:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2014 15:50:34 +0000 (08:50 -0700)
commit1aacb90eaaac057c10fd746e189553e04cfeb291
treeeaf5b2eddc9e2e446b5402c106a3bf086aee925a
parentb05d59dfceaea72565b1648af929b037b0f96d7f
parent31789538e3ba7dd164e063d4978c96af1894be4c
Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/trivial into next

Pull trivial tree changes from Jiri Kosina:
 "Usual pile of patches from trivial tree that make the world go round"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
  staging: go7007: remove reference to CONFIG_KMOD
  aic7xxx: Remove obsolete preprocessor define
  of: dma: doc fixes
  doc: fix incorrect formula to calculate CommitLimit value
  doc: Note need of bc in the kernel build from 3.10 onwards
  mm: Fix printk typo in dmapool.c
  modpost: Fix comment typo "Modules.symvers"
  Kconfig.debug: Grammar s/addition/additional/
  wimax: Spelling s/than/that/, wording s/destinatary/recipient/
  aic7xxx: Spelling s/termnation/termination/
  arm64: mm: Remove superfluous "the" in comment
  of: Spelling s/anonymouns/anonymous/
  dma: imx-sdma: Spelling s/determnine/determine/
  ath10k: Improve grammar in comments
  ath6kl: Spelling s/determnine/determine/
  of: Improve grammar for of_alias_get_id() documentation
  drm/exynos: Spelling s/contro/control/
  radio-bcm2048.c: fix wrong overflow check
  doc: printk-formats: do not mention casts for u64/s64
  doc: spelling error changes
  ...
15 files changed:
Documentation/devicetree/bindings/arm/omap/omap.txt
Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
Documentation/devicetree/bindings/spi/spi-bus.txt
Documentation/edac.txt
Documentation/filesystems/proc.txt
Documentation/gpio/consumer.txt
Documentation/hid/uhid.txt
Documentation/networking/can.txt
Documentation/virtual/kvm/api.txt
arch/arm64/include/asm/pgtable.h
drivers/net/wireless/ath/ath10k/wmi.h
drivers/of/base.c
drivers/pci/pci.c
include/linux/of_platform.h
lib/Kconfig.debug