]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 03:52:59 +0000 (13:52 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 May 2014 03:52:59 +0000 (13:52 +1000)
commit1c81c698da188f1bd319e0ad05783adc5c10f97d
treebdd088c3b7ecc3d021cae08d20fe2de7772a8022
parent427c5509fb640e47a64cfe646805eaf5447750d6
parent5835f25117ef6a56144bfc6be98b5a3cb188bf7a
Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
13 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
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