From: Jens Axboe <axboe@fb.com>
Date: Mon, 19 May 2014 17:52:35 +0000 (-0600)
Subject: Merge branch 'for-3.16/blk-mq-tagging' into for-3.16/core
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~49^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39a9f97e5ea99e048c4980c23cf197f6e77995cb;p=pandora-kernel.git

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
---

39a9f97e5ea99e048c4980c23cf197f6e77995cb
Reading git-diff-tree failed