Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx...

diff --cc arch/sh/drivers/dma/Kconfig
Simple merge

diff --cc arch/sh/include/asm/dma-sh.h
Simple merge

diff --cc drivers/dma/at_hdmac.c
Simple merge

diff --cc drivers/dma/dw_dmac.c
Simple merge

diff --cc drivers/dma/txx9dmac.c
Simple merge

diff --cc drivers/md/raid5.c
Simple merge

diff --cc include/linux/pci_ids.h
Simple merge