aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'tag-for-linus-3.5' of git://git.linaro.org/people/sumitsemwal/linu...Linus Torvalds2012-05-253-8/+233
|\
| * dma-buf: add initial vmap documentationDave Airlie2012-05-251-0/+11
| * dma-buf: minor documentation fixes.Sumit Semwal2012-05-252-4/+8
| * dma-buf: add vmap interfaceDave Airlie2012-05-252-0/+48
| * dma-buf: mmap supportDaniel Vetter2012-05-253-8/+170
* | Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dmaLinus Torvalds2012-05-2519-105/+169
|\ \
| * | dmaengine: at_hdmac: take maxburst from slave configurationNicolas Ferre2012-05-154-26/+24
| * | dmaengine: at_hdmac: remove ATC_DEFAULT_CTRLA constantNicolas Ferre2012-05-151-7/+5
| * | dmaengine: at_hdmac: remove some at_dma_slave commentsNicolas Ferre2012-05-151-5/+0
| * | Merge branch 'fixes' into nextVinod Koul2012-05-152-2/+6
| |\ \
| * | | dma: imx-sdma: make channel0 operations atomicRichard Zhao2012-05-111-26/+31
| * | | dmaengine: Fixup dmaengine_prep_slave_single() to be actually usefulKuninori Morimoto2012-05-111-2/+4
| * | | dmaengine: Use dma_sg_len(sg) instead of sg->lengthLars-Peter Clausen2012-05-117-16/+16
| * | | dmaengine: Use sg_dma_address instead of sg_physLars-Peter Clausen2012-05-115-8/+8
| * | | DMA: PL330: Remove duplicate header file inclusionSachin Kamat2012-05-111-1/+0
| * | | Merge branch 'fixes' into nextVinod Koul2012-05-111-1/+2
| |\ \ \
| * | | | dma: imx-sdma: keep the callbacks invoked in the taskletHuang Shijie2012-05-111-2/+7
| * | | | dmaengine: dw_dma: add Device Tree probing capabilityViresh Kumar2012-05-112-0/+27
| * | | | dmaengine: dw_dmac: Add clk_{un}prepare() supportViresh Kumar2012-05-111-6/+6
| * | | | Merge branch 'fixes' into nextVinod Koul2012-04-252-10/+16
| |\ \ \ \
| * | | | | dma/amba-pl08x: add support for the Nomadik variantLinus Walleij2012-04-253-7/+42
| * | | | | dma/amba-pl08x: check for terminal count status onlyLinus Walleij2012-04-231-1/+1
* | | | | | Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma...Linus Torvalds2012-05-2541-780/+2898
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'for-next-arm-dma' into for-linusMarek Szyprowski2012-05-229-461/+1123
| |\ \ \ \ \ \
| | * | | | | | ARM: dma-mapping: add support for IOMMU mapperMarek Szyprowski2012-05-215-12/+747
| | * | | | | | ARM: dma-mapping: use alloc, mmap, free from dma_opsMarek Szyprowski2012-05-213-66/+104
| | * | | | | | ARM: dma-mapping: remove redundant code and do the cleanupMarek Szyprowski2012-05-211-64/+24
| | * | | | | | ARM: dma-mapping: move all dma bounce code to separate dma ops structureMarek Szyprowski2012-05-213-120/+120
| | * | | | | | ARM: dma-mapping: implement dma sg methods on top of any generic dma opsMarek Szyprowski2012-05-211-24/+19
| | * | | | | | ARM: dma-mapping: use asm-generic/dma-mapping-common.hMarek Szyprowski2012-05-214-231/+115
| | * | | | | | ARM: dma-mapping: remove offset parameter to prepare for generic dma_opsMarek Szyprowski2012-05-213-39/+45
| | * | | | | | ARM: dma-mapping: introduce DMA_ERROR_CODE constantMarek Szyprowski2012-05-213-5/+7
| | * | | | | | ARM: dma-mapping: use pr_* instread of printkMarek Szyprowski2012-05-211-8/+8
| | * | | | | | ARM: dma-mapping: use dma_mmap_from_coherent()Marek Szyprowski2012-05-211-0/+3
| | * | | | | | common: add dma_mmap_from_coherent() functionMarek Szyprowski2012-05-212-1/+45
| | | |_|_|_|/ | | |/| | | |
| * | | | | | ARM: dma-mapping: use PMD size for section unmapVitaly Andrianov2012-05-211-1/+1
| * | | | | | cma: fix migration modeMinchan Kim2012-05-211-1/+1
| * | | | | | ARM: integrate CMA with DMA-mapping subsystemMarek Szyprowski2012-05-219-88/+370
| * | | | | | X86: integrate CMA with DMA-mapping subsystemMarek Szyprowski2012-05-216-9/+38
| * | | | | | drivers: add Contiguous Memory AllocatorMarek Szyprowski2012-05-218-0/+641
| * | | | | | mm: trigger page reclaim in alloc_contig_range() to stabilise watermarksMarek Szyprowski2012-05-212-0/+69
| * | | | | | mm: extract reclaim code from __alloc_pages_direct_reclaim()Marek Szyprowski2012-05-211-9/+21
| * | | | | | mm: Serialize access to min_free_kbytesMel Gorman2012-05-211-8/+15
| * | | | | | mm: page_isolation: MIGRATE_CMA isolation functions addedMichal Nazarewicz2012-05-216-27/+34
| * | | | | | mm: mmzone: MIGRATE_CMA migration type addedMichal Nazarewicz2012-05-216-27/+106
| * | | | | | mm: page_alloc: change fallbacks array handlingMichal Nazarewicz2012-05-211-4/+5
| * | | | | | mm: page_alloc: introduce alloc_contig_range()Michal Nazarewicz2012-05-212-0/+196
| * | | | | | mm: compaction: export some of the functionsMichal Nazarewicz2012-05-213-173/+191
| * | | | | | mm: compaction: introduce isolate_freepages_range()Michal Nazarewicz2012-05-211-18/+93
| * | | | | | mm: compaction: introduce map_pages()Michal Nazarewicz2012-05-211-4/+11