]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes-for-v3.14' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Feb 2014 19:58:56 +0000 (11:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Feb 2014 19:58:56 +0000 (11:58 -0800)
commit69b4f162e64835a2ff9ac2420213fec129c831c9
treeced3194db6057c5bafee503465f2fb63d96e293a
parent93bf1c1331d7b13906a7efe4985e6a457c94f43b
parentd7c9e54f4fa0b0970f5aad834ae39af1c975af6f
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