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: 94f8ae0 60b435d)

author	Neil Brown <neilb@suse.de>
	Thu, 19 Jun 2008 06:38:37 +0000 (16:38 +1000)
committer	Neil Brown <neilb@suse.de>
	Thu, 19 Jun 2008 06:38:37 +0000 (16:38 +1000)
commit	370ac380fda9fb0d813f210ed2b342cfbde07cf0
tree	79680600bef18504fc82362fe3134d2b316f44ab	tree \| snapshot
parent	94f8ae072f885eac63fa45a3f8573a2c17a5bf7b	commit \| diff
parent	60b435db5a7b085ad1204168879037bf14ebd6d1	commit \| diff

Merge branch 'master' into devel-3.0

Conflicts:

Makefile

Assemble.c	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
ReadMe.c	diff1 \|	diff2 \|	blob \| history
mdadm.c	diff1 \|	diff2 \|	blob \| history
super0.c	diff1 \|	diff2 \|	blob \| history

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