| commit | 298e320431db1db52b9ddd6f242bb33a4ea2d094 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 18 06:26:24 2015 +1200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sun Jan 18 06:26:24 2015 +1200 |
| tree | ef1ce12b65b2989958559c6a51dbde9b9cff08dd | |
| 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