Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jun 2013 17:05:10 +0000 (10:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 8 Jun 2013 17:05:10 +0000 (10:05 -0700)
commitd7a39e300d0cea54379a7d92e11f2c8e5e5e2142
tree3561fdbff6a1ae2131745ae8b568888d6314b57a
parent14d0ee051753f30e23033bdb153110f00b03c8ce
parentbcc567e3115055a9cc256183d72864f01286be22
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

Pull slave-dmaengine fixes from Vinod Koul:
 "Fix from Andy is for dmatest regression reported by Will and Rabin has
  fixed runtime ref counting for st_dma40"

* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
  dmatest: do not allow to interrupt ongoing tests
  dmaengine: ste_dma40: fix pm runtime ref counting