Paul Mundt 285eba57db Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:
	include/linux/serial_sci.h

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

2010-07-05 15:46:08 +09: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

of/dma: fix build breakage in ppc4xx adma driver

2010-07-02 15:46:17 -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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-05-31 13:14:26 +09:00

Makefile

DMA: PL330: Add dma api driver

2010-05-23 20:28:19 -07:00

mpc512x_dma.c

of/dma: mpc512x_dma.c: Fix build failures

2010-06-02 13:45:08 -06: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

pl330.c

DMA: PL330: Add dma api driver

2010-05-23 20:28:19 -07:00

shdma.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2010-05-31 13:14:26 +09: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

kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT_MAX and SHRT_MIN

2010-05-25 08:07:02 -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