From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Feb 2017 17:22:08 +0000 (-0800)
Subject: Merge tag 'dmaengine-fix-4.10-rc7' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=35609502ac5dea2b149ec0368791d9c0e246bd65;p=openwrt%2Fstaging%2Fblogic.git

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

Pull dmaengine fixes from Vinod Koul:
 "A couple of fixes showed up late in the cycle so sending them up and
  sending early in the week and not on Friday :).

  They fix a double lock in pl330 driver and runtime pm fixes for cppi
  driver"

* tag 'dmaengine-fix-4.10-rc7' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: pl330: fix double lock
  dmaengine: cppi41: Clean up pointless warnings
  dmaengine: cppi41: Fix oops in cppi41_runtime_resume
  dmaengine: cppi41: Fix runtime PM timeouts with USB mass storage
---

35609502ac5dea2b149ec0368791d9c0e246bd65