]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'blk-mq/core' into for-next
authorJens Axboe <axboe@kernel.dk>
Thu, 24 Oct 2013 10:34:56 +0000 (11:34 +0100)
committerJens Axboe <axboe@kernel.dk>
Thu, 24 Oct 2013 10:34:56 +0000 (11:34 +0100)
commit652dc7a39deed5fb99be62c84a9582a628e2bfbe
treee5e81e508c907399821a805dc4463789984e9007
parent3212b7a6ca2ac78bdb784cd63904ad44ce4bbb08
parent4b670560763647357168c6cc115b224fe12fb1c3
Merge branch 'blk-mq/core' into for-next

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