From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 8 Nov 2013 16:08:12 +0000 (-0700)
Subject: Merge branch 'blk-mq/core' into for-3.13/core
X-Git-Tag: v3.13-rc1~101^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e37459b8e2c7db6735e39e019e448b76e5e77647;p=pandora-kernel.git

Merge branch 'blk-mq/core' into for-3.13/core

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Conflicts:
	block/blk-timeout.c
---

e37459b8e2c7db6735e39e019e448b76e5e77647
Reading git-diff-tree failed