summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-18 06:26:24 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-18 06:26:24 +1200
commit298e320431db1db52b9ddd6f242bb33a4ea2d094 (patch)
treeef1ce12b65b2989958559c6a51dbde9b9cff08dd /MAINTAINERS
parent59b2858f57bbd42f36aa177d21ab011a87da3de2 (diff)
parent6acf3998d2c7420b2deb2b475fa78ba7573c6162 (diff)
downloadop-kernel-dev-298e320431db1db52b9ddd6f242bb33a4ea2d094.zip
op-kernel-dev-298e320431db1db52b9ddd6f242bb33a4ea2d094.tar.gz
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
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ab6610e..5e61aef 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3183,7 +3183,7 @@ L: dmaengine@vger.kernel.org
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
S: Maintained
F: drivers/dma/
-F: include/linux/dma*
+F: include/linux/dmaengine.h
F: Documentation/dmaengine/
T: git git://git.infradead.org/users/vkoul/slave-dma.git
OpenPOWER on IntegriCloud