Merge tag 'dmaengine-fix-4.10-rc7' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Feb 2017 17:22:08 +0000 (09:22 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 1 Feb 2017 17:22:08 +0000 (09:22 -0800)
commit35609502ac5dea2b149ec0368791d9c0e246bd65
tree6819f6bc5b8c3585b7a19cc0d8d25d703a1bc57c
parentc325b3533730016ca5cdaf902d62550b4243fe43
parent91539eb1fda2d530d3b268eef542c5414e54bf1a
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