]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.16/core' into for-3.16/drivers
authorJens Axboe <axboe@fb.com>
Wed, 28 May 2014 16:18:51 +0000 (10:18 -0600)
committerJens Axboe <axboe@fb.com>
Wed, 28 May 2014 16:18:51 +0000 (10:18 -0600)
commitc4729e3d179722ac41f7985f9a5b7ad5837cb5e6
tree6a1014ab27531dae2702894e9e3cb6cdad9f0d60
parent78654a4caae1d518babba7b94239dc791aa54734
parent52216c356d21011d32844aab0647855aef9d6bd6
Merge branch 'for-3.16/core' into for-3.16/drivers

Pull in core changes (again), since we got rid of the alloc/free
hctx mq_ops hooks and mtip32xx then needed updating again.

Signed-off-by: Jens Axboe <axboe@fb.com>
drivers/block/mtip32xx/mtip32xx.c
drivers/block/null_blk.c
drivers/block/virtio_blk.c