git.ipfire.org Git - thirdparty/mdadm.git/commit

]> git.ipfire.org Git - thirdparty/mdadm.git/commit

projects / thirdparty / mdadm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 71d60c4 7b403fe)

author	NeilBrown <neilb@suse.de>
	Thu, 30 Oct 2008 02:59:11 +0000 (13:59 +1100)
committer	NeilBrown <neilb@suse.de>
	Thu, 30 Oct 2008 02:59:11 +0000 (13:59 +1100)
commit	6c766cf10178b9bae4ddcfd6b8de2d70f9d84568
tree	7287af68b8f177d25beab071932bf7b6984c1462	tree \| snapshot
parent	71d60c480ac37a20b0b7a896a818a5f0c9c55f1a	commit \| diff
parent	7b403fef7e97c16e1eb63773a278eb65c6dfd9a8	commit \| diff

Merge branch 'master' into devel-3.0

Conflicts:

Incremental.c
super0.c
super1.c

Detail.c	diff1 \|	diff2 \|	blob \| history
Incremental.c	diff1 \|	diff2 \|	blob \| history
mdopen.c	diff1 \|	diff2 \|	blob \| history
super0.c	diff1 \|	diff2 \|	blob \| history
util.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.