From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Sep 2012 22:46:04 +0000 (-0700)
Subject: Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Tag: v3.6~15
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b56adb54e825fc548126b20b479d138a683d2b8c;p=~emulex%2Finfiniband.git

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()
---

b56adb54e825fc548126b20b479d138a683d2b8c