]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'trivial/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 03:44:09 +0000 (13:44 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 May 2014 03:44:09 +0000 (13:44 +1000)
commit5e0216b6b358631396fb1a9961c6cfdb06d0c372
treea9bff218fa88432cd533769d95895b9021aaa167
parentd94ac5dacad802ff0035881e2687d70153fa87e4
parent221069bed0c73e876e1df1f6cd0140cb353fcd32
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