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)
Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/blk-mq-tag.c


Trivial merge