From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 8 Jun 2013 17:05:10 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.10-rc5~8
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d7a39e300d0cea54379a7d92e11f2c8e5e5e2142;p=linux-2.6-block.git

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
---

d7a39e300d0cea54379a7d92e11f2c8e5e5e2142