diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 10:49:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-03 10:49:04 -0700 |
| commit | 3333222484dc7e46fd17cc1d394088fb0d963e6c (patch) | |
| tree | 0b2c74327cf0ae200030c9892e6b267fd9a26bb1 /include | |
| parent | 180d89f6ef9c22d088e324eb5e7d030ef3f84df0 (diff) | |
| parent | 63f89caad0e32dcfa17b2d17919816253de48996 (diff) | |
| download | linux-3333222484dc7e46fd17cc1d394088fb0d963e6c.tar.bz2 | |
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave dmaengine fixes from Vinod Koul:
"Here are the fixes in dmaengine subsystem for rc2:
- privatecnt fix for slave dma request API by Christopher
- warn fix for PM ifdef in usb-dmac by Geert
- fix hardware dependency for xgene by Jean"
* 'next' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: increment privatecnt when using dma_get_any_slave_channel
dmaengine: xgene: Set hardware dependency
dmaengine: usb-dmac: Protect PM-only functions to kill warning
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions