From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 26 Feb 2016 21:42:05 +0000 (+0100)
Subject: Merge tag 'davinci-for-v4.6/edma' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.6-rc1~76^2~13
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/8bba98a8c1527f1cc121776cf5fac97ac2d3089c?hp=-c

Merge tag 'davinci-for-v4.6/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

Merge "DaVinci EDMA enhancements for v4.6" from Sekhar Nori:

Pass dma_slave_map data to EDMA driver. This will help
migration to new DMA engine API for requesting
slave channels dma_request_chan().

* tag 'davinci-for-v4.6/edma' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: dm646x: Add dma_slave_map to edma
  ARM: davinci: dm644x: Add dma_slave_map to edma
  ARM: davinci: dm365: Add dma_slave_map to edma
  ARM: davinci: dm355: Add dma_slave_map to edma
  ARM: davinci: devices-da8xx: Add dma_slave_map to edma
---

8bba98a8c1527f1cc121776cf5fac97ac2d3089c