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: 4abe6b7 b3d3195)

author	NeilBrown <neilb@suse.de>
	Sun, 26 Oct 2008 23:10:08 +0000 (10:10 +1100)
committer	NeilBrown <neilb@suse.de>
	Sun, 26 Oct 2008 23:10:08 +0000 (10:10 +1100)
commit	b01b06bda8dce132e6eb3c3826ad0f4b94ebdf43
tree	6344c839508876df740b6fd7326ef2323c6f8142	tree \| snapshot
parent	4abe6b708687f9982bfbc0629e1070bf49714fa3	commit \| diff
parent	b3d3195538e315b3863235731112eee7398d4340	commit \| diff

Merge branch 'master' into devel-3.0

Conflicts:

Create.c
Manage.c

Create.c	diff1 \|	diff2 \|	blob \| history
Manage.c	diff1 \|	diff2 \|	blob \| history
mdadm.8	diff1 \|	diff2 \|	blob \| history
mdadm.c	diff1 \|	diff2 \|	blob \| history
mdadm.h	diff1 \|	diff2 \|	blob \| history

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