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: 8aae421 11cd8b7)

author	NeilBrown <neilb@suse.de>
	Fri, 17 Oct 2008 01:46:23 +0000 (12:46 +1100)
committer	NeilBrown <neilb@suse.de>
	Fri, 17 Oct 2008 01:46:23 +0000 (12:46 +1100)
commit	492350045c7e40741069caa7d017209439db665b
tree	48ddb56482580bb809830ddc6971a79459d0ca72	tree \| snapshot
parent	8aae4219a2668acb88ad2777dacf69de941e7e07	commit \| diff
parent	11cd8b79c0690bf39b40a25352f86a82a838622a	commit \| diff

Merge branch 'master' into devel-3.0

Conflicts:

Manage.c

Detail.c	diff1 \|	diff2 \|	blob \| history
Manage.c	diff1 \|	diff2 \|	blob \| history
bitmap.c	diff1 \|	diff2 \|	blob \| history
mdadm.8	diff1 \|	diff2 \|	blob \| history
mdadm.h	diff1 \|	diff2 \|	blob \| history
super0.c	diff1 \|	diff2 \|	blob \| history
super1.c	diff1 \|	diff2 \|	blob \| history
util.c	diff1 \|	diff2 \|	blob \| history

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