From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Dec 2012 19:27:10 +0000 (-0800)
Subject: Merge branch 'for-v3.8' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
X-Git-Tag: v3.12-rc1~1853
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c45564e91604ca4d03505ba4d567541c7e4f86fe;p=kernel%2Fkernel-generic.git

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

c45564e91604ca4d03505ba4d567541c7e4f86fe