]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jan 2015 18:26:24 +0000 (06:26 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jan 2015 18:26:24 +0000 (06:26 +1200)
commitcb42c77051f5b1b8f8d40dc191e97322c78f69a1
treeef1ce12b65b2989958559c6a51dbde9b9cff08dd
parentbd3ea9810633ab5c6744c58e2013715bef7f573a
parent2f03b91f67ec3ffeadbd5943293d8bcb0ce32c7c
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fixes from Vinod Koul:
 "Two patches, the first by Andy to fix dw dmac runtime pm and second
  one by me to fix the dmaengine headers in MAINTAINERS"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: dw: balance PM runtime calls
  MAINTAINERS: dmaengine: fix the header file for dmaengine
MAINTAINERS