From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Feb 2013 21:23:47 +0000 (+1100)
Subject: Merge branch 'fixes-for-v3.8-rc7' of git://git.linaro.org/people/mszyprowski/linux... 
X-Git-Tag: v3.8-rc7~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=85e28c76e249eae95df5545f297fe40f71c643d8;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'fixes-for-v3.8-rc7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

Pull DMA mapping fixes from Marek Szyprowski:
 "This pull request contains important bugfix patches for 9
  architectures, which finally fixes broken allmodconfig builds
  introduced in v3.8-rc1.  Those architectures don't use dma_map_ops
  based implementation and require manual update or additional dummy
  implementations of the missing new dma-mapping api functions:
  dma_mmap_coherent and dma_get_sgtable."

* 'fixes-for-v3.8-rc7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  xtensa: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
  parisc: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
  mn10300: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
  m68k: Provide dma_mmap_coherent() and dma_get_sgtable()
  frv: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
  cris: Provide dma_mmap_coherent() and dma_get_sgtable()
  c6x: Provide dummy dma_mmap_coherent() and dma_get_sgtable()
  blackfin: Provide dma_mmap_coherent() and dma_get_sgtable()
  avr32: Provide dma_mmap_coherent() and dma_get_sgtable()
---

85e28c76e249eae95df5545f297fe40f71c643d8