From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Oct 2012 22:57:48 +0000 (-0700)
Subject: Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cff7b8ba60e3;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull CMA and DMA-mapping fixes from Marek Szyprowski:
 "This consists mainly of a set of one-liner fixes and cleanups for a
  few minor issues identified in both Contiguous Memory Allocator code
  and ARM DMA-mapping subsystem."

* 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: mm: Remove unused arm_vmregion priv field
  ARM: dma-mapping: fix build warning in __dma_alloc()
  ARM: dma-mapping: support debug_dma_mapping_error
  mm: cma: alloc_contig_range: return early for err path
  drivers: cma: Fix wrong CMA selected region size default value
  drivers: dma-coherent: Fix typo in dma_mmap_from_coherent documentation
  drivers: dma-contiguous: Don't redefine SZ_1M
---

cff7b8ba60e332377568c3d55c8036e9b1de32e6