From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Feb 2014 19:58:56 +0000 (-0800)
Subject: Merge branch 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d49649615d3673ec94139fbd0918fb13949a1d8b;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Pull DMA-mapping fixes from Marek Szyprowski:
 "This contains fixes for incorrect atomic test in dma-mapping subsystem
  for ARM and x86 architecture"

* 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  x86: dma-mapping: fix GFP_ATOMIC macro usage
  ARM: dma-mapping: fix GFP_ATOMIC macro usage
---

d49649615d3673ec94139fbd0918fb13949a1d8b