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)
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>
1  2 
drivers/block/mtip32xx/mtip32xx.c
drivers/block/null_blk.c
drivers/block/virtio_blk.c

Simple merge
Simple merge
Simple merge