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

diff --cc block/blk-mq-tag.c
Simple merge

diff --cc block/blk-mq-tag.h
Simple merge

diff --cc block/blk-mq.c
Simple merge

diff --cc include/linux/blk-mq.h
Simple merge