diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-11 19:52:13 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-11 19:52:13 +0200 |
commit | 8fa5975900ba4e91e14a63f11fb7a026f60cecd5 (patch) | |
tree | 91171ea8afa319ff49d4e78474d882a0341bd4a9 /block/blk-mq.c | |
parent | Merge tag 'for-linus-4.0-1' of git://git.code.sf.net/p/openipmi/linux-ipmi (diff) | |
parent | dmaengine: cppi41: add missing bitfields (diff) | |
download | linux-8fa5975900ba4e91e14a63f11fb7a026f60cecd5.tar.xz linux-8fa5975900ba4e91e14a63f11fb7a026f60cecd5.zip |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fix from Vinod Koul:
"I have one more fix to fix the boot warning on cppi driver due to
missing capabilities"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: cppi41: add missing bitfields
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions