]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
Merge branch 'for-3.16/blk-mq-tagging' into for-3.16/core
authorJens Axboe <axboe@fb.com>
Mon, 19 May 2014 17:52:35 +0000 (11:52 -0600)
committerJens Axboe <axboe@fb.com>
Mon, 19 May 2014 17:52:35 +0000 (11:52 -0600)
commit39a9f97e5ea99e048c4980c23cf197f6e77995cb
treeb1f72ed1e852372b6d86b79157b09f77fabc5a20
parent1429d7c9467e1e3de0b0ff91d7e4d67c1a92f8a3
parent0d2602ca30e410e84e8bdf05c84ed5688e0a5a44
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
block/blk-mq-tag.c
block/blk-mq-tag.h
block/blk-mq.c
include/linux/blk-mq.h