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: d3a1c53 fdaf36b)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 00:55:15 +0000 (10:55 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 30 May 2014 00:55:15 +0000 (10:55 +1000)
commit	b8678db9c5a75239d55d2b682afc60f158cdfd5a
tree	248cfe418a9d634262397beeb4b73b895d2ecec8	tree \| snapshot
parent	d3a1c5342a40617c2f1cced13343741dddb063df	commit \| diff
parent	fdaf36bd360fe1e74b34262ad705ef39d52c12de	commit \| diff

Merge remote-tracking branch 'pci/next'

Conflicts:
arch/s390/pci/pci_sysfs.c

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci-common.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/pci_of_scan.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/include/asm/pci_64.h	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/misc/genwqe/card_utils.c	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/dma-mapping.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules