Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
ioat	bitops: rename for_each_bit() to for_each_set_bit()	2010-03-06 11:26:23 -08:00
ipu	Merge branch 'coh' into dmaengine	2010-03-03 21:22:21 -07:00
ppc4xx	dma: make Open Firmware device id constant	2010-02-02 23:41:06 -07:00
at_hdmac.c	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2009-12-30 13:46:29 -08:00
at_hdmac_regs.h	at_hdmac: implement a private tx_list	2009-09-08 17:53:03 -07:00
coh901318.c	DMAENGINE: COH 901 318 configure channel direction	2010-03-02 14:17:46 -07:00
coh901318_lli.c	DMAENGINE: COH 901 318 lli sg offset fix	2010-03-02 14:17:46 -07:00
coh901318_lli.h	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
dmaengine.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu	2010-03-03 07:34:18 -08:00
dmatest.c	Merge branch 'coh' into dmaengine	2010-03-03 21:22:21 -07:00
dw_dmac.c	Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2009-12-30 13:46:29 -08:00
dw_dmac_regs.h
fsldma.c	fsldma: Fix cookie issues	2010-02-28 22:18:16 -07:00
fsldma.h	fsldma: major cleanups and fixes	2010-02-02 14:51:42 -07:00
iop-adma.c	iop-adma.c: use resource_size()	2009-12-11 21:24:33 -07:00
iovlock.c
Kconfig	dma: Add MPC512x DMA driver	2010-03-01 22:16:42 -07:00
Makefile	dma: Add MPC512x DMA driver	2010-03-01 22:16:42 -07:00
mpc512x_dma.c	dma: Add MPC512x DMA driver	2010-03-01 22:16:42 -07:00
mv_xor.c	mv_xor: implement a private tx_list	2009-09-08 17:53:03 -07:00
mv_xor.h	mv_xor: implement a private tx_list	2009-09-08 17:53:03 -07:00
shdma.c	dmaengine: shdma: extend .device_terminate_all() to record partial transfer	2010-03-02 11:12:03 +09:00
shdma.h	dmaengine: shdma: extend .device_terminate_all() to record partial transfer	2010-03-02 11:12:03 +09:00
txx9dmac.c	const: constify remaining dev_pm_ops	2009-12-15 08:53:25 -08:00
txx9dmac.h	txx9dmac: implement a private tx_list	2009-09-08 17:53:03 -07:00