git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Jens Axboe <axboe@fb.com>
	Thu, 11 Sep 2014 15:31:18 +0000 (09:31 -0600)
committer	Jens Axboe <axboe@fb.com>
	Thu, 11 Sep 2014 15:31:18 +0000 (09:31 -0600)
commit	a5b5ff2aab1bceb0f5003da98097c546160a07c3
tree	51daa46b89b83cad422941f52110b19571b85b79	tree \| snapshot
parent	e407e0fd6848039d0569482dccf8ba9235cf9e61	commit \| diff
parent	7102e282946bfb4263405db7d5604f0c9d3e2126	commit \| diff

Merge branch 'for-linus' into for-3.18/core

A bit of churn on the for-linus side that would be nice to have
in the core bits for 3.18, so pull it in to catch us up and make
forward progress easier.

Signed-off-by: Jens Axboe <axboe@fb.com>
Conflicts:
block/scsi_ioctl.c

block/blk-core.c	diff1 \|	diff2 \|	blob \| history
block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
block/cfq-iosched.c	diff1 \|	diff2 \|	blob \| history
block/scsi_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

block/blk-core.c	diff1 \|	diff2 \|	blob \| history
block/blk-mq.c	diff1 \|	diff2 \|	blob \| history
block/cfq-iosched.c	diff1 \|	diff2 \|	blob \| history
block/scsi_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	diff1 \|	diff2 \|	blob \| history