projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 018a17b a516440)
Merge branch 'for-linus' into for-3.18/core
authorJens Axboe <axboe@fb.com>
Thu, 11 Sep 2014 15:31:18 +0000 (09:31 -0600)
committerJens Axboe <axboe@fb.com>
Thu, 11 Sep 2014 15:31:18 +0000 (09:31 -0600)
commitb207892b061da7608878e273ae22ba9bf9be264b
tree51daa46b89b83cad422941f52110b19571b85b79tree | snapshot
parent018a17bdc8658ad448497c84d4ba21b6985820eccommit | diff
parenta516440542afcb9647f88d12c35640baf02d07eacommit | 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
John Crispins staging tree