Merge branch 'fixes-for-3.9' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Mar 2013 00:35:03 +0000 (17:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Mar 2013 00:35:03 +0000 (17:35 -0700)
commitc7f17deb316e41a9db28d7486f4067d06d68ebf0
tree979178b5f58b4f2378824df31974387d03048a52
parentde1893f64045ab476060bd09fb9f3bc35d7b7b57
parent9d1400cf79afb49584b4873eb22cd5130cb341db
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