commit c7f17deb316e41a9db28d7486f4067d06d68ebf0
author Linus Torvalds <torvalds@linux-foundation.org> Fri Mar 15 17:35:03 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Mar 15 17:35:03 2013 -0700
tree 979178b5f58b4f2378824df31974387d03048a52
parent de1893f64045ab476060bd09fb9f3bc35d7b7b57
parent 9d1400cf79afb49584b4873eb22cd5130cb341db

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

Pull DMA-mapping fix from Marek Szyprowski:
 "An important fix for all ARM architectures which use ZONE_DMA.
  Without it dma_alloc_* calls with GFP_ATOMIC flag might have allocated
  buffers outsize DMA zone."

* 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: DMA-mapping: add missing GFP_DMA flag for atomic buffer allocation