]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:40:39 +0000 (13:40 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 16 May 2014 03:40:39 +0000 (13:40 +1000)
commitcfa3f5c4e0c3a43f94818579fba10a9638b5750b
treef924a51caa142259605aabcb7b4ff8d0bd9da483
parent2288e198db435794613ed467a73611fd1f78dc9e
parent5835f25117ef6a56144bfc6be98b5a3cb188bf7a
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
14 files changed:
Documentation/devicetree/bindings/arm/omap/omap.txt
Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
Documentation/edac.txt
Documentation/filesystems/proc.txt
Documentation/gpio/consumer.txt
Documentation/hid/uhid.txt
Documentation/networking/can.txt
arch/arm64/include/asm/pgtable.h
drivers/net/wireless/ath/ath10k/wmi.h
drivers/net/wireless/ath/ath6kl/wmi.h
drivers/of/base.c
drivers/pci/pci.c
lib/Kconfig.debug
scripts/mod/modpost.c