git.ipfire.org Git - thirdparty/mdadm.git/commit - Kill.c

]> git.ipfire.org Git - thirdparty/mdadm.git/commit - Kill.c

projects / thirdparty / mdadm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b06e309 3a56f22)

author	NeilBrown <neilb@suse.de>
	Thu, 18 Dec 2008 05:56:13 +0000 (16:56 +1100)
committer	NeilBrown <neilb@suse.de>
	Thu, 18 Dec 2008 05:56:13 +0000 (16:56 +1100)
commit	8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4
tree	8c09f1ce1ab41c6218a0e4705e3227bc7b7c022b	tree \| snapshot
parent	b06e30958b6ef4d26497894b2584757b40565d91	commit \| diff
parent	3a56f223e94106102eed3fd2b08d3ecad353361b	commit \| diff

Merge branch 'master' into devel-3.0

Conflicts:

Assemble.c
Incremental.c
Kill.c
ReadMe.c
inventory
mapfile.c
mdadm.8
mdadm.spec
mdassemble.8

Assemble.c	diff1 \|	diff2 \|	blob \| history
Incremental.c	diff1 \|	diff2 \|	blob \| history
Kill.c	diff1 \|	diff2 \|	blob \| history
inventory	diff1 \|	diff2 \|	blob \| history
mapfile.c	diff1 \|	diff2 \|	blob \| history
mdadm.conf.5	diff1 \|	diff2 \|	blob \| history

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