]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jun 2014 18:51:51 +0000 (11:51 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jun 2014 18:51:51 +0000 (11:51 -0700)
commitcd4b7b9da3908fdfb5b15141baa6c7336dd0928e
tree6170ccd68e32ac47666879c35e9a2af922bbf446
parent6762aecbebb9487b34de243e96226d194936d21e
parent0cf06395116d2724739f2a7148d02504437115fd
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