From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Jul 2012 15:43:12 +0000 (-0700)
Subject: Merge branch 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Tag: upstream/snapshot3+hdmi~7068
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5bb93f1a212e756834bc380682210647b5cdfcf1;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

Pull CMA and DMA-mapping fixes from Marek Szyprowski:
 "Another set of minor fixups for recently merged Contiguous Memory
  Allocator and ARM DMA-mapping changes.  Those patches fix mysterious
  crashes on systems with CMA and Himem enabled as well as some corner
  cases caused by typical off-by-one bug."

* 'fixes-for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: modify condition check while freeing pages
  mm: cma: fix condition check when setting global cma area
  mm: cma: don't replace lowmem pages with highmem
---

5bb93f1a212e756834bc380682210647b5cdfcf1