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 36ede19a16304f212513b829c9cf3b3b2e0441cc,aa71962352ffd84c74ad022a67f2b2c27402f434..5aea9fc9b3a820c7175c4561265715f391c8f432
--- 1/Documentation/devicetree/bindings/arm/omap/omap.txt
--- 2/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@@ -117,8 -114,5 +117,8 @@@ Boards
  - AM43x EPOS EVM
    compatible = "ti,am43x-epos-evm", "ti,am4372", "ti,am43"
  
- - DRA7 EVM:  Software Developement Board for DRA7XX
 +- AM437x GP EVM
 +  compatible = "ti,am437x-gp-evm", "ti,am4372", "ti,am43"
 +
+ - DRA7 EVM:  Software Development Board for DRA7XX
    compatible = "ti,dra7-evm", "ti,dra7"

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 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 lib/Kconfig.debug
Simple merge

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