git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f2e95e5 87ad44a)

author	NeilBrown <neilb@suse.com>
	Sat, 5 Sep 2015 09:07:04 +0000 (11:07 +0200)
committer	NeilBrown <neilb@suse.com>
	Sat, 5 Sep 2015 09:08:32 +0000 (11:08 +0200)
commit	506160d89daf2575a74856ca5b4c2a81e1994485
tree	f9df292ed03a5a3c4ddc658ae3646f02a1ffafce	tree \| snapshot
parent	f2e95e5d5f187384d6811109116f6b227dc5e226	commit \| diff
parent	87ad44abc50e1c9a080565ec6bd5c05a3a61e7c2	commit \| diff

Merge linux-block/for-4.3/core into md/for-linux

There were a few conflicts that are fairly easy to resolve.

Signed-off-by: NeilBrown <neilb@suse.com>

drivers/md/md.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid0.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid1.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid10.c	diff1 \|	diff2 \|	blob \| history
drivers/md/raid5.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.