Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Sep 2012 22:46:04 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Sep 2012 22:46:04 +0000 (15:46 -0700)
commitb56adb54e825fc548126b20b479d138a683d2b8c
treeafccd7c7b19cd4fe50e397a332c7b45c9b62eec2
parent39618435a0d9f4269b2374da68eb652cfa777b0c
parentec10665cbf271fb1f60daeb194ad4f2cdcdc59d9
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull ARM dma-mapping fix from Marek Szyprowski:
 "This patch fixes a potential memory leak in the ARM dma-mapping code."

* 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: Fix potential memory leak in atomic_pool_init()