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: 44dba9d 42cf209)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 02:09:13 +0000 (13:09 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 20 Feb 2013 02:09:13 +0000 (13:09 +1100)
commit	fcc251bd737ca4cceca97b5eb3d12b5dfdf4515d
tree	b944cb2555de1b4015bcf5db87e3a91ce033f7ac	tree \| snapshot
parent	44dba9d1f3f34f42fbe8fced3c785a0232a58b80	commit \| diff
parent	42cf20980cded7e0ecdd6dba74592d059c6a8bda	commit \| diff

Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/ioat/dma_v3.c
drivers/dma/tegra20-apb-dma.c

20 files changed:

arch/arm/boot/dts/exynos5250.dtsi	diff1 \|	diff2 \|	blob \| history
drivers/dma/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/dma/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/dma/dw_dmac.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/edma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ioat/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ioat/dma.h	diff1 \|	diff2 \|	blob \| history
drivers/dma/ioat/dma_v2.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ioat/dma_v3.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/ioat/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/iop-adma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/mmp_pdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/mv_xor.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/pch_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/pl330.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/sh/shdma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/sirf-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/dma/tegra20-apb-dma.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsmc_nand.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules