]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'v3.15-rc1' into for-3.16/core
authorJens Axboe <axboe@fb.com>
Tue, 15 Apr 2014 20:02:24 +0000 (14:02 -0600)
committerJens Axboe <axboe@fb.com>
Tue, 15 Apr 2014 20:02:24 +0000 (14:02 -0600)
commit566b6d6aff89320b9e6c166ef60385b42778250d
tree6d4ca8c67dc22d1c81053392078588f9ab3804b5
parentcdb67c84cf2847fcc22ceb070e99506ed84befd4
parent55addf3150ef37e6b38d415547cc6f20b4d9aca1
Merge tag 'v3.15-rc1' into for-3.16/core

We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
block/blk-core.c
drivers/scsi/scsi_lib.c
include/linux/blkdev.h