git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eeae4ac 3178953)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 03:55:56 +0000 (13:55 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 03:55:56 +0000 (13:55 +1000)
commit	c7611eb0e03dc7f8b6ba5789fcb7b06064f3d996
tree	a92027caf55439269abb4a2cf936bcd81eff97b0	tree \| snapshot
parent	eeae4ac873c95aa4ed775b396ad62b9afb27b999	commit \| diff
parent	31789538e3ba7dd164e063d4978c96af1894be4c	commit \| diff

Merge remote-tracking branch 'trivial/for-next'

Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt

17 files changed:

Documentation/devicetree/bindings/arm/omap/omap.txt	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/mtd/gpmc-nand.txt	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt	diff1 \|	diff2 \|	blob \| history
Documentation/edac.txt	diff1 \|	diff2 \|	blob \| history
Documentation/filesystems/proc.txt	diff1 \|	diff2 \|	blob \| history
Documentation/gpio/consumer.txt	diff1 \|	diff2 \|	blob \| history
Documentation/hid/uhid.txt	diff1 \|	diff2 \|	blob \| history
Documentation/networking/can.txt	diff1 \|	diff2 \|	blob \| history
Documentation/virtual/kvm/api.txt	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/wmi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/wmi.h	diff1 \|	diff2 \|	blob \| history
drivers/of/base.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/of_platform.h	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
scripts/mod/modpost.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules