From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Jan 2015 18:26:24 +0000 (+1200)
Subject: Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
X-Git-Tag: v3.19-rc5~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=298e320431db1db52b9ddd6f242bb33a4ea2d094;p=~emulex%2Finfiniband.git

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

298e320431db1db52b9ddd6f242bb33a4ea2d094