Merge branch 'blk-mq/core' into for-3.13/core
authorJens Axboe <axboe@kernel.dk>
Fri, 8 Nov 2013 16:08:12 +0000 (09:08 -0700)
committerJens Axboe <axboe@kernel.dk>
Fri, 8 Nov 2013 16:08:12 +0000 (09:08 -0700)
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Conflicts:
block/blk-timeout.c


Trivial merge