Merge remote-tracking branch 'trivial/for-next'

Conflicts:
	Documentation/devicetree/bindings/arm/omap/omap.txt

diff --cc Documentation/devicetree/bindings/arm/omap/omap.txt
index 189baba40cd64b83bce95140b53b7af82b1d2f65,aa71962352ffd84c74ad022a67f2b2c27402f434..d22b216f5d230f57812f98034580c603b4a6e30d
--- 1/Documentation/devicetree/bindings/arm/omap/omap.txt
--- 2/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@@ -126,11 -114,5 +126,11 @@@ Boards
  - AM43x EPOS EVM
    compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"
  
 -- DRA7 EVM:  Software Development Board for DRA7XX
 -  compatible = "ti,dra7-evm", "ti,dra7"
 +- AM437x GP EVM
 +  compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"
 +
- - DRA742 EVM:  Software Developement Board for DRA742
++- DRA742 EVM:  Software Development Board for DRA742
 +  compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"
 +
 +- DRA722 EVM: Software Development Board for DRA722
 +  compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"

diff --cc Documentation/devicetree/bindings/mtd/gpmc-nand.txt
Simple merge

diff --cc Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
Simple merge

diff --cc Documentation/edac.txt
Simple merge

diff --cc Documentation/filesystems/proc.txt
Simple merge

diff --cc Documentation/gpio/consumer.txt
Simple merge

diff --cc Documentation/hid/uhid.txt
Simple merge

diff --cc Documentation/networking/can.txt
Simple merge

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

diff --cc arch/arm64/include/asm/pgtable.h
Simple merge

diff --cc drivers/net/wireless/ath/ath10k/wmi.h
Simple merge

diff --cc drivers/net/wireless/ath/ath6kl/wmi.h
Simple merge

diff --cc drivers/of/base.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

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

diff --cc lib/Kconfig.debug
Simple merge

diff --cc scripts/mod/modpost.c
Simple merge