]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Oct 2012 17:01:43 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 26 Oct 2012 17:01:43 +0000 (10:01 -0700)
commitef48bfd6fe4ade12bae4e8e5b58edc4023d5f96b
tree4cd4732e1c6d306a24bb357d1b8a958ca57cc907
parent622f202a4cba7acbd843f22fa67c206c15d45034
parent697575896670ba9e76760ce8bbc1f5a3001967d6
Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull DMA-mapping revert from Marek Szyprowski:
 "Due to my mistake, my previous pull request (merged as commit
  cff7b8ba60e3: "Merge branch 'fixes_for_linus' ..") contained a patch
  which is aimed for v3.8 and lacks its dependences.  This pull request
  reverts it and fixes build break of ARM architecture."

* 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  Revert "ARM: dma-mapping: support debug_dma_mapping_error"