tree a3f0944db87a8ae0d41e5acbbbabc1e7ef534d1b
parent c7d1ba417c7cb7297d14dd47a390ec90ce548d5c
parent e7e245000110a7794de8f925b9edc06a9c852f80
author Jens Axboe <axboe@kernel.dk> 1383926892 -0700
committer Jens Axboe <axboe@kernel.dk> 1383926892 -0700

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

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

Conflicts:
	block/blk-timeout.c