diff options
author | Jens Axboe <axboe@fb.com> | 2014-05-30 08:11:50 -0600 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-05-30 08:11:50 -0600 |
commit | f89ca166460e84620db73d4542f28d34c40a8917 (patch) | |
tree | 6f7ef4b566879674d3dfc6e79b71561a49ac877e /drivers/block/virtio_blk.c | |
parent | 879466e6a53ce063fa779476cf648abafcd703a9 (diff) | |
parent | 2230237500821aedfcf2bba2a79d9cbca389233c (diff) | |
download | linux-f89ca166460e84620db73d4542f28d34c40a8917.tar.gz linux-f89ca166460e84620db73d4542f28d34c40a8917.tar.bz2 linux-f89ca166460e84620db73d4542f28d34c40a8917.zip |
Merge branch 'for-3.16/core' into for-3.16/drivers
Pulled in for the blk_mq_tag_to_rq() change, which impacts
mtip32xx.
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/block/virtio_blk.c')
0 files changed, 0 insertions, 0 deletions