diff options
| author |   Jens Axboe <axboe@fb.com> | 2014-05-28 10:18:51 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-05-28 10:18:51 -0600 |
| commit | 0fb662e2250afdf2c54253dbf2063dc9d8369b69 (patch) | |
| tree | 6a1014ab27531dae2702894e9e3cb6cdad9f0d60 /include/linux/blkdev.h | |
| parent | Merge branch 'for-3.16/core' into for-3.16/drivers (diff) | |
| parent | blk-mq: remove alloc_hctx and free_hctx methods (diff) | |
| download | linux-dev-0fb662e2250afdf2c54253dbf2063dc9d8369b69.tar.xz linux-dev-0fb662e2250afdf2c54253dbf2063dc9d8369b69.zip | |
Merge branch 'for-3.16/core' into for-3.16/drivers
Pull in core changes (again), since we got rid of the alloc/free
hctx mq_ops hooks and mtip32xx then needed updating again.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/blkdev.h')
0 files changed, 0 insertions, 0 deletions