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

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

projects / thirdparty / mdadm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e38cc2d 2b9aa33)

author	NeilBrown <neilb@suse.de>
	Thu, 1 Oct 2009 06:58:40 +0000 (16:58 +1000)
committer	NeilBrown <neilb@suse.de>
	Thu, 1 Oct 2009 06:58:40 +0000 (16:58 +1000)
commit	ca4f89a3b76187dcd7ca897035a8e92ab67b252d
tree	cfb7a91f30f6f3b51662257c47b581089705acb1	tree \| snapshot
parent	e38cc2d87b319572fe7ff08be5657f563b1ef9e7	commit \| diff
parent	2b9aa337af7291d3f141322da96c9f667c99d53c	commit \| diff

Merge branch 'master' into devel-3.1

Conflicts:
mdadm.8

13 files changed:

Assemble.c	diff1 \|	diff2 \|	blob \| history
Detail.c	diff1 \|	diff2 \|	blob \| history
Grow.c	diff1 \|	diff2 \|	blob \| history
Manage.c	diff1 \|	diff2 \|	blob \| history
ReadMe.c	diff1 \|	diff2 \|	blob \| history
mdadm.8	diff1 \|	diff2 \|	blob \| history
mdadm.c	diff1 \|	diff2 \|	blob \| history
mdadm.h	diff1 \|	diff2 \|	blob \| history
restripe.c	diff1 \|	diff2 \|	blob \| history
super0.c	diff1 \|	diff2 \|	blob \| history
super1.c	diff1 \|	diff2 \|	blob \| history
sysfs.c	diff1 \|	diff2 \|	blob \| history
util.c	diff1 \|	diff2 \|	blob \| history

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