From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 4 Nov 2014 05:01:04 +0000 (-0800)
Subject: Merge branch 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Tag: v3.18-rc4~27
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f3ed88a6bce69942b44fa7927a92cd52011881d7;p=linux.git

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

Pull CMA and DMA-mapping fixes from Marek Szyprowski:
 "This contains important fixes for recently introduced highmem support
  for default contiguous memory region used for dma-mapping subsystem"

* 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  mm, cma: make parameters order consistent in func declaration and definition
  mm: cma: Use %pa to print physical addresses
  mm: cma: Ensure that reservations never cross the low/high mem boundary
  mm: cma: Always consider a 0 base address reservation as dynamic
  mm: cma: Don't crash on allocation if CMA area can't be activated
---

f3ed88a6bce69942b44fa7927a92cd52011881d7