tree b1f72ed1e852372b6d86b79157b09f77fabc5a20
parent 1429d7c9467e1e3de0b0ff91d7e4d67c1a92f8a3
parent 0d2602ca30e410e84e8bdf05c84ed5688e0a5a44
author Jens Axboe <axboe@fb.com> 1400521955 -0600
committer Jens Axboe <axboe@fb.com> 1400521955 -0600

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