Grant Likely cf9b59e9d3 Merge remote branch 'origin' into secretlab/next-devicetree ... Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>		2010-05-22 00:36:56 -06:00
..
ioat	Merge branch 'ioat' into dmaengine	2010-05-17 16:30:58 -07:00
ipu	DMAENGINE: extend the control command to include an arg	2010-05-17 16:30:42 -07:00
ppc4xx	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
at_hdmac_regs.h	at_hdmac: implement a private tx_list	2009-09-08 17:53:03 -07:00
at_hdmac.c	Merge branch 'ioat' into dmaengine	2010-05-17 16:30:58 -07:00
coh901318_lli.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
coh901318_lli.h	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
coh901318.c	DMAENGINE: extend the control command to include an arg	2010-05-17 16:30:42 -07:00
dmaengine.c	Merge branch 'ioat' into dmaengine	2010-05-17 16:30:58 -07:00
dmatest.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
dw_dmac_regs.h	dw_dmac: implement a private tx_list	2009-09-08 17:53:02 -07:00
dw_dmac.c	DMAENGINE: extend the control command to include an arg	2010-05-17 16:30:42 -07:00
fsldma.c	Merge remote branch 'origin' into secretlab/next-devicetree	2010-05-22 00:36:56 -06:00
fsldma.h	fsldma: major cleanups and fixes	2010-02-02 14:51:42 -07:00
iop-adma.c	Merge branch 'ioat' into dmaengine	2010-05-17 16:30:58 -07:00
iovlock.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
Kconfig	DMAENGINE: Support for ST-Ericssons DMA40 block v3	2010-04-14 14:49:20 -07:00
Makefile	DMAENGINE: Support for ST-Ericssons DMA40 block v3	2010-04-14 14:49:20 -07:00
mpc512x_dma.c	Merge branch 'ioat' into dmaengine	2010-05-17 16:30:58 -07:00
mv_xor.c	Merge branch 'ioat' into dmaengine	2010-05-17 16:30:58 -07:00
mv_xor.h	mv_xor: implement a private tx_list	2009-09-08 17:53:03 -07:00
shdma.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-05-21 17:05:46 -07:00
shdma.h	dmaengine: shdma: Introduce include/linux/sh_dma.h	2010-03-23 17:20:06 +09:00
ste_dma40_ll.c	DMAENGINE: Support for ST-Ericssons DMA40 block v3	2010-04-14 14:49:20 -07:00
ste_dma40_ll.h	DMAENGINE: Support for ST-Ericssons DMA40 block v3	2010-04-14 14:49:20 -07:00
ste_dma40.c	DMAENGINE: extend the control command to include an arg	2010-05-17 16:30:42 -07:00
timb_dma.c	DMAENGINE: extend the control command to include an arg	2010-05-17 16:30:42 -07:00
txx9dmac.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx	2010-05-21 17:05:46 -07:00
txx9dmac.h	txx9dmac: implement a private tx_list	2009-09-08 17:53:03 -07:00