git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c7d1ba4 e7e2450)

author	Jens Axboe <axboe@kernel.dk>
	Fri, 8 Nov 2013 16:08:12 +0000 (09:08 -0700)
committer	Jens Axboe <axboe@kernel.dk>
	Fri, 8 Nov 2013 16:08:12 +0000 (09:08 -0700)
commit	e37459b8e2c7db6735e39e019e448b76e5e77647
tree	a3f0944db87a8ae0d41e5acbbbabc1e7ef534d1b	tree \| snapshot
parent	c7d1ba417c7cb7297d14dd47a390ec90ce548d5c	commit \| diff
parent	e7e245000110a7794de8f925b9edc06a9c852f80	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
block/blk-timeout.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/sd.c	diff1 \|	diff2 \|	blob \| history
include/linux/bio.h	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.