Merge branch 'blk-mq/core' into for-3.13/core
authorJens Axboe <axboe@kernel.dk>
Fri, 25 Oct 2013 14:28:47 +0000 (15:28 +0100)
committerJens Axboe <axboe@kernel.dk>
Fri, 25 Oct 2013 14:28:47 +0000 (15:28 +0100)
commitd63ddcfe708494acc3af32d1dd134cb0d8c9122b
tree3a4f2015eebe58f91616633726bf68111b994592
parentdfc302d833c46f40b5f775099da00bb0cf0e81ad
parent280d45f6c35d8d7a0fe20c36caf426e3ac139cf9
Merge branch 'blk-mq/core' into for-3.13/core

Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-timeout.c
block/blk-core.c
block/blk-timeout.c