tree f686dce956b8ceef91215aff55009555875b394c
parent 93874681aa3f538a2b9d59a6c5b7c0e882a36978
parent 4009793e15d44469da1547a46ab129cc08ffa503
author Linus Torvalds <torvalds@linux-foundation.org> 1355254030 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1355254030 -0800

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

Pull CMA and DMA-mapping update from Marek Szyprowski:
 "Another set of Contiguous Memory Allocator and DMA-mapping framework
  updates for v3.8.

  This pull request consists only of two patches.  The first fixes a
  long standing issue with dmapools (the code predates current GIT
  history), which forced all allocations to use GFP_ATOMIC flag,
  ignoring the flags passed by the caller.  The second patch changes CMA
  code to correctly use phys_addr_t type what enables support for LPAE
  systems."

* 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  drivers: cma: represent physical addresses as phys_addr_t
  mm: dmapool: use provided gfp flags for all dma_alloc_coherent() calls