From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 3 May 2015 17:49:04 +0000 (-0700)
Subject: Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3333222484dc7e46fd17cc1d394088fb0d963e6c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Pull slave dmaengine fixes from Vinod Koul:
 "Here are the fixes in dmaengine subsystem for rc2:

   - privatecnt fix for slave dma request API by Christopher

   - warn fix for PM ifdef in usb-dmac by Geert

   - fix hardware dependency for xgene by Jean"

* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: increment privatecnt when using dma_get_any_slave_channel
  dmaengine: xgene: Set hardware dependency
  dmaengine: usb-dmac: Protect PM-only functions to kill warning
---

3333222484dc7e46fd17cc1d394088fb0d963e6c