]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 May 2015 17:49:04 +0000 (10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 3 May 2015 17:49:04 +0000 (10:49 -0700)
commit1076be7dab42a90086d7b7e143dc7c3a8b7c9c11
tree0b2c74327cf0ae200030c9892e6b267fd9a26bb1
parente8b5eaf777c28dc014656ebf19d7144cde5cb700
parenta47cbced62dbf3ab36b38b8d0c44f31ec82403e2
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