| commit | ff806d034ef8e9a95ff0b0532104dd65332e446b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 03 11:51:51 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jun 03 11:51:51 2014 -0700 |
| tree | 6170ccd68e32ac47666879c35e9a2af922bbf446 | |
| parent | 312c76f1a3989b8d0c0c13fee765bb2c41f2d114 [diff] | |
| parent | f70e3c4f8b6ab61f713e040822ec51f5de498146 [diff] |
Merge branch 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping into next Pull CMA and DMA-mapping fixes from Marek Szyprowski: "A few fixes for dma-mapping and CMA subsystems" * 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping: CMA: correct unlock target drivers/base/dma-contiguous.c: erratum of dev_get_cma_area arm: dma-mapping: add checking cma area initialized arm: dma-iommu: Clean up redundant variable cma: Remove potential deadlock situation