]> 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)
commit89a33fe47bbe301aff365e15873ee955d9c08022
tree6a1014ab27531dae2702894e9e3cb6cdad9f0d60
parentecedee3e4c1d70ec35a18d8d4541f928b5c95d89
parente995bc51004b791a63f305f92c9c33426b7effb8
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