diff options
author | Jens Axboe <axboe@fb.com> | 2014-05-19 19:52:35 +0200 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2014-05-19 19:52:35 +0200 |
commit | 39a9f97e5ea99e048c4980c23cf197f6e77995cb (patch) | |
tree | b1f72ed1e852372b6d86b79157b09f77fabc5a20 /mm/Makefile | |
parent | blk-mq: switch ctx pending map to the sparser blk_align_bitmap (diff) | |
parent | blk-mq: improve support for shared tags maps (diff) | |
download | linux-39a9f97e5ea99e048c4980c23cf197f6e77995cb.tar.xz linux-39a9f97e5ea99e048c4980c23cf197f6e77995cb.zip |
Merge branch 'for-3.16/blk-mq-tagging' into for-3.16/core
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/blk-mq-tag.c
Diffstat (limited to 'mm/Makefile')
0 files changed, 0 insertions, 0 deletions