]> Pileus Git - ~andy/linux/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)
commitd49649615d3673ec94139fbd0918fb13949a1d8b
treeced3194db6057c5bafee503465f2fb63d96e293a
parentb080e047a61f7050246ff3081f87832997170d29
parentc091c71ad2218fc50a07b3d1dab85783f3b77efd
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