Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Sep 2012 00:53:11 +0000 (17:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 15 Sep 2012 00:53:11 +0000 (17:53 -0700)
commit1568d9f425c3fd54ac8d807cf1cbf87ad6b40b27
tree7e74f1f5657a13fbfe2a4cd6c06a2e8d3140044b
parent1c23ce720d79494f5a1c2bcd7ebcae7aedc91c98
parentf3d87524975f01b885fc3d009c6ab6afd0d00746
Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull one more DMA-mapping fix from Marek Szyprowski:
 "This patch fixes very subtle bug (typical off-by-one error) which
  might appear in very rare circumstances."

* 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  arm: mm: fix DMA pool affiliation check