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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 21f9fcd c9eaa44)

author	Jens Axboe <axboe@fb.com>
	Tue, 15 Apr 2014 20:02:24 +0000 (14:02 -0600)
committer	Jens Axboe <axboe@fb.com>
	Tue, 15 Apr 2014 20:02:24 +0000 (14:02 -0600)
commit	f89e0dd9d1a72fdf6b8958bcadfa6abf84f3cae0
tree	6d4ca8c67dc22d1c81053392078588f9ab3804b5	tree \| snapshot
parent	21f9fcd81593e201172160853b8647336fb81f4f	commit \| diff
parent	c9eaa447e77efe77b7fa4c953bd62de8297fd6c5	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/scsi/scsi_lib.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree