Merge branch 'ioat' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Mon, 17 May 2010 23:30:58 +0000 (16:30 -0700)
committerDan Williams <dan.j.williams@intel.com>
Mon, 17 May 2010 23:30:58 +0000 (16:30 -0700)
commit0b28330e39bbe0ffee4c56b09fc415fcec595ea3
treefcf504879883763557e696eff81427b1ab78f76b
parent058276303dbc4ed089c1f7dad0871810b1f5ddf1
parentcaa20d974c86af496b419eef70010e63b7fab7ac
Merge branch 'ioat' into dmaengine
16 files changed:
drivers/dma/at_hdmac.c
drivers/dma/dmaengine.c
drivers/dma/fsldma.c
drivers/dma/ioat/dma.c
drivers/dma/ioat/dma.h
drivers/dma/ioat/dma_v2.c
drivers/dma/ioat/dma_v3.c
drivers/dma/iop-adma.c
drivers/dma/mpc512x_dma.c
drivers/dma/mv_xor.c
drivers/dma/ppc4xx/adma.c
drivers/dma/shdma.c
drivers/mmc/host/atmel-mci.c
drivers/serial/sh-sci.c
include/linux/dmaengine.h
sound/soc/txx9/txx9aclc.c