diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-25 15:57:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-25 15:57:48 -0700 |
| commit | cff7b8ba60e332377568c3d55c8036e9b1de32e6 (patch) | |
| tree | e2aa7d2e91548229464389a7848a218666deea6d /kernel | |
| parent | 4864ccbb5a6f99e4c44dc816304007547a268b9f (diff) | |
| parent | 4e85fb831aa210fd1c5e2cb7909ac203c1f5b67f (diff) | |
| download | linux-cff7b8ba60e332377568c3d55c8036e9b1de32e6.tar.bz2 | |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions