From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 26 Oct 2012 17:01:43 +0000 (-0700)
Subject: Merge branch 'fixes_for_linus' of git://git.linaro.org/people/mszyprowski/linux-dma... 
X-Git-Tag: v3.7-rc3~18
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=ef48bfd6fe4ade12bae4e8e5b58edc4023d5f96b;p=linux.git

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"
---

ef48bfd6fe4ade12bae4e8e5b58edc4023d5f96b