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)
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


Trivial merge