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: 9ca2c81 e5669f4)

author	NeilBrown <neilb@suse.de>
	Thu, 7 Aug 2008 04:12:25 +0000 (14:12 +1000)
committer	NeilBrown <neilb@suse.de>
	Thu, 7 Aug 2008 04:12:25 +0000 (14:12 +1000)
commit	37ea3936a696c2b102963ba5117165ef6be8d4b4
tree	75fe06d0b49ef74f834a25920f003c693023857e	tree \| snapshot
parent	9ca2c81c0f8bd37ef24e5e3ac898ffb6cfd00117	commit \| diff
parent	e5669f40047ba0a8354418d0af5f7e7d862aaea4	commit \| diff

Merge branch 'master' into from-stable

Conflicts:

Create.c
Manage.c

Create.c	diff1 \|	diff2 \|	blob \| history
Grow.c	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Manage.c	diff1 \|	diff2 \|	blob \| history
Query.c	diff1 \|	diff2 \|	blob \| history
ReadMe.c	diff1 \|	diff2 \|	blob \| history
md.4	diff1 \|	diff2 \|	blob \| history
mdadm.8	diff1 \|	diff2 \|	blob \| history
mdadm.c	diff1 \|	diff2 \|	blob \| history
test	diff1 \|	diff2 \|	blob \| history

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