From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 May 2018 16:54:02 +0000 (-0700)
Subject: Merge tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v4.17-rc6~13
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0b449a441dac919444face9e3b6ca6aaec30791d;p=linux-2.6-block.git

Merge tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fix from Vinod Koul:

 - qcom bam runtime_pm fix

 - email update for Vinod

* tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: qcom: bam_dma: check if the runtime pm enabled
  dmaengine: Update email address for Vinod
---

0b449a441dac919444face9e3b6ca6aaec30791d