From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jun 2014 18:51:51 +0000 (-0700)
Subject: Merge branch 'for-v3.16' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ff806d034ef8e9a95ff0b0532104dd65332e446b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

ff806d034ef8e9a95ff0b0532104dd65332e446b