diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-14 15:48:26 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-14 15:48:26 -1000 |
| commit | b86a7563ca617aa49dfd6b836da4dd0351fe2acc (patch) | |
| tree | 29b6dc87f9a8f9cf2d1aee5e24c4f697240651a0 /fs/ocfs2/blockcheck.h | |
| parent | dc75117fa28af52220cf31ea18493684cf0ffc35 (diff) | |
| parent | 88d04643c66052a1cf92a6fd5f92dff0f7757f61 (diff) | |
| download | op-kernel-dev-b86a7563ca617aa49dfd6b836da4dd0351fe2acc.zip op-kernel-dev-b86a7563ca617aa49dfd6b836da4dd0351fe2acc.tar.gz | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Here are hopefully last set of fixes for 4.1. This time we have:
- fixing pause capability reporting on both dmaengine pause & resume
support by Krzysztof
- locking fix fir at_xdmac by Ludovic
- slave configuration fix for at_xdmac by Ludovic"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: Fix choppy sound because of unimplemented resume
dmaengine: at_xdmac: rework slave configuration part
dmaengine: at_xdmac: lock fixes
Diffstat (limited to 'fs/ocfs2/blockcheck.h')
0 files changed, 0 insertions, 0 deletions
