diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-17 13:26:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-17 13:26:24 -0500 |
| commit | 298e320431db1db52b9ddd6f242bb33a4ea2d094 (patch) | |
| tree | ef1ce12b65b2989958559c6a51dbde9b9cff08dd /MAINTAINERS | |
| parent | 59b2858f57bbd42f36aa177d21ab011a87da3de2 (diff) | |
| parent | 6acf3998d2c7420b2deb2b475fa78ba7573c6162 (diff) | |
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-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ab6610e6c610..5e61aef972ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3183,7 +3183,7 @@ L: dmaengine@vger.kernel.org | |||
| 3183 | Q: https://patchwork.kernel.org/project/linux-dmaengine/list/ | 3183 | Q: https://patchwork.kernel.org/project/linux-dmaengine/list/ |
| 3184 | S: Maintained | 3184 | S: Maintained |
| 3185 | F: drivers/dma/ | 3185 | F: drivers/dma/ |
| 3186 | F: include/linux/dma* | 3186 | F: include/linux/dmaengine.h |
| 3187 | F: Documentation/dmaengine/ | 3187 | F: Documentation/dmaengine/ |
| 3188 | T: git git://git.infradead.org/users/vkoul/slave-dma.git | 3188 | T: git git://git.infradead.org/users/vkoul/slave-dma.git |
| 3189 | 3189 | ||