From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Aug 2012 18:30:30 +0000 (+0300)
Subject: Merge branch 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski... 
X-Git-Tag: v3.6-rc2~21
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f720e7ea3a77cc9e88eb2b2bd762021646d6be52;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Pull three dma-mapping fixes from Marek Szyprowski.

* 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: fix incorrect freeing of atomic allocations
  ARM: dma-mapping: fix atomic allocation alignment
  ARM: mm: fix MMU mapping of CMA regions
---

f720e7ea3a77cc9e88eb2b2bd762021646d6be52