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

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

projects / thirdparty / mdadm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 45b662b 1a0ee0b)

author	NeilBrown <neilb@suse.de>
	Wed, 7 Jan 2009 22:31:28 +0000 (09:31 +1100)
committer	NeilBrown <neilb@suse.de>
	Wed, 7 Jan 2009 22:31:28 +0000 (09:31 +1100)
commit	78fbcc10312649f2f4f88283e3f19dce9b205733
tree	db2596ad62db5b86e1e08a693eb4b5dad2b57d30	tree \| snapshot
parent	45b662b611a6fbbdd018a65b6f205e91df884c37	commit \| diff
parent	1a0ee0baf049809f9e67d60bb8158801eada3bd5	commit \| diff

Merge branch 'master' into scratch-3.0

Conflicts:

Assemble.c
config.c

Monitor.c	diff1 \|	diff2 \|	blob \| history
config.c	diff1 \|	diff2 \|	blob \| history
mapfile.c	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.