git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6178976 cdef54d)

author	Jens Axboe <axboe@fb.com>
	Wed, 28 May 2014 16:18:51 +0000 (10:18 -0600)
committer	Jens Axboe <axboe@fb.com>
	Wed, 28 May 2014 16:18:51 +0000 (10:18 -0600)
commit	0fb662e2250afdf2c54253dbf2063dc9d8369b69
tree	6a1014ab27531dae2702894e9e3cb6cdad9f0d60	tree \| snapshot
parent	6178976500ae61fa7b12ebb2d3de816dc9396388	commit \| diff
parent	cdef54dd85ad66e77262ea57796a3e81683dd5d6	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/block/null_blk.c	diff1 \|	diff2 \|	blob \| history
drivers/block/virtio_blk.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree