Merge tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 May 2018 16:54:02 +0000 (09:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 19 May 2018 16:54:02 +0000 (09:54 -0700)
commit0b449a441dac919444face9e3b6ca6aaec30791d
tree34e73a4f46c465c1c6408df681a4c8e08942ef9c
parent423913ad4ae5b3e8fb8983f70969fb522261ba26
parentdbad41e7bb5f4b9949ff5ea1d76c20711f326308
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
MAINTAINERS