From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Jun 2015 01:48:26 +0000 (-1000)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b86a7563ca617aa49dfd6b836da4dd0351fe2acc;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:
 "Here are hopefully last set of fixes for 4.1. This time we have:

   - fixing pause capability reporting on both dmaengine pause & resume
     support by Krzysztof

   - locking fix fir at_xdmac by Ludovic

   - slave configuration fix for at_xdmac by Ludovic"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: Fix choppy sound because of unimplemented resume
  dmaengine: at_xdmac: rework slave configuration part
  dmaengine: at_xdmac: lock fixes
---

b86a7563ca617aa49dfd6b836da4dd0351fe2acc