projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 312c76f f70e3c4)
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)
commitff806d034ef8e9a95ff0b0532104dd65332e446b
tree6170ccd68e32ac47666879c35e9a2af922bbf446tree | snapshot (tar.gz zip)
parent312c76f1a3989b8d0c0c13fee765bb2c41f2d114commit | diff
parentf70e3c4f8b6ab61f713e040822ec51f5de498146commit | 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
Motorola kernel-slsi