]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 04:04:31 +0000 (14:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 May 2014 04:04:31 +0000 (14:04 +1000)
commitffafcf30d194dd72be12c0260a815794e5bc3c2c
tree9fe51429fdfc846a84e2bb79f9ac6703516116cb
parent901fe3936138d0b01ab534aa90244c12808b353a
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