tree 98e58b314bcb0097294a81ef31306579cea752e1
parent ce1928da8440eb5f73c20c5c88a449a4d59209d0
parent dda02fd6278d9e995850b3c1dba484f17cbe4de4
author Linus Torvalds <torvalds@linux-foundation.org> 1415077264 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1415077264 -0800

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