summaryrefslogtreecommitdiffstats
path: root/drivers/dma
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2010-05-317-9/+893
|\
| * Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2010-05-303-0/+876
| |\
| | * DMA: PL330: Add dma api driverJassi Brar2010-05-233-0/+876
| * | kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT...Alexey Dobriyan2010-05-251-1/+1
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-05-241-0/+5
| |\ \
| | * | sh: guard cookie consistency across termination in the DMA driverGuennadi Liakhovetski2010-05-221-0/+4
| | * | sh: prevent the DMA driver from unloading, while in useGuennadi Liakhovetski2010-05-221-0/+1
| | |/
| * | Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-2225-470/+4883
| |\|
| * | of: Remove duplicate fields from of_platform_driverGrant Likely2010-05-222-5/+8
| * | of: Always use 'struct device.of_node' to get device node pointer.Grant Likely2010-05-181-3/+3
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2010-05-2424-450/+4845
|\ \ \ | | |/ | |/|
| * | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/asy...Linus Torvalds2010-05-2124-450/+4845
| |\ \
| | * \ Merge branch 'ioat' into dmaengineDan Williams2010-05-1717-209/+170
| | |\ \
| | | * | async_tx: trim dma_async_tx_descriptor in 'no channel switch' caseDan Williams2010-05-171-7/+9
| | | * | ioat: Remove duplicated devm_kzalloc() calls for ioatdma_deviceMinskey Guo2010-05-021-6/+1
| | | * | ioat3: disable cacheline-unaligned transfers for raid operationsDan Williams2010-05-011-3/+3
| | | * | ioat2,3: convert to producer/consumer lockingDan Williams2010-05-014-181/+134
| | | * | ioat: convert to circ_bufDan Williams2010-05-012-12/+8
| | | |/
| | * | DMAENGINE: extend the control command to include an argLinus Walleij2010-05-179-14/+23
| | * | DMAENGINE: DMA40 fix for allocation of logical channel 0Marcin Mielczarczyk2010-05-171-7/+8
| | * | DMAENGINE: DMA40 support paused channel statusJonas Aaberg2010-05-171-8/+67
| | * | dmaengine: mpc512x: Use resource_sizeTobias Klauser2010-05-171-1/+1
| | * | DMA ENGINE: Do not reset 'private' of channelJassi Brar2010-05-171-2/+0
| | * | DMAENGINE: Support for ST-Ericssons DMA40 block v3Linus Walleij2010-04-145-0/+3412
| | * | async_tx: use of kzalloc/kfree requires the include of slab.hStephen Rothwell2010-03-291-0/+1
| | * | dmaengine: provide helper for setting txstateDan Williams2010-03-2613-88/+17
| | * | DMAENGINE: generic channel status v2Linus Walleij2010-03-2617-160/+170
| | * | DMAENGINE: generic slave control v2Linus Walleij2010-03-269-35/+94
| | * | dma: timb-dma: Update comment and fix compiler warningRichard Röjfors2010-03-261-2/+5
| | * | dma: Add timb-dmaRichard Röjfors2010-03-253-0/+861
| | * | DMAENGINE: COH 901 318 fix bytesleftLinus Walleij2010-03-241-8/+88
| | * | DMAENGINE: COH 901 318 rename confusing varsLinus Walleij2010-03-241-38/+65
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval...Paul Mundt2010-05-202-11/+30
|\| | |
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-05-192-14/+15
| |\ \ \
| | * \ \ Merge branch 'sh/stable-updates'Paul Mundt2010-04-2615-6/+36
| | |\ \ \
| | * | | | SH: constify multiple DMA related objects and references to themGuennadi Liakhovetski2010-04-261-5/+7
| * | | | | Merge branch 'sh/for-2.6.34' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2010-05-061-6/+21
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | SH: fix error paths in DMA driverGuennadi Liakhovetski2010-04-261-6/+21
| | | |_|/ | | |/| |
| * / | | MIPS: TXx9: Add missing MODULE_ALIAS definitions for TXx9 platform devicesGeert Uytterhoeven2010-04-301-0/+2
| |/ / /
| | | |
| \ \ \
*-. | | | Merge branches 'genesis/dmaengine', 'genesis/intc-extension' and 'genesis/i2c...Paul Mundt2010-04-0715-0/+15
|\ \| | | | | |_|/ | |/| |
| | * | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3015-0/+15
| |/ /
* | / dmaengine: shdma: Enable on SH-Mobile ARMMagnus Damm2010-04-072-5/+5
| |/ |/|
* | dmaengine: shdma: Introduce include/linux/sh_dma.hMagnus Damm2010-03-232-4/+2
* | dmaengine: shdma: Common SH_DMA_SLAVE_NUMBERMagnus Damm2010-03-232-2/+3
* | dmaengine: shdma: Remove sh_dmae_slave_chan_id enumMagnus Damm2010-03-231-4/+4
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2010-03-121-1/+1
|\
| * Merge branch 'for-next' into for-linusJiri Kosina2010-03-081-1/+1
| |\
| | * tree-wide: Assorted spelling fixesDaniel Mack2010-02-091-1/+1
* | | Driver core: Constify struct sysfs_ops in struct kobj_typeEmese Revfy2010-03-072-2/+2
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2010-03-072-202/+324
|\ \