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

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

projects / thirdparty / mdadm.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9a40c32 c9f39c1)

author	NeilBrown <neilb@suse.de>
	Mon, 11 May 2009 06:05:41 +0000 (16:05 +1000)
committer	NeilBrown <neilb@suse.de>
	Mon, 11 May 2009 06:05:41 +0000 (16:05 +1000)
commit	8320878543bb5e49b5acb24fa919ff11be485c61
tree	299b6ca3d559d818f4b8dd25756c3f5feda0e91f	tree \| snapshot
parent	9a40c32728dceb66bac603e96656223944b6c7d4	commit \| diff
parent	c9f39c1b9bafbd18ce3831c8da6865b21827fef3	commit \| diff

Merge branch 'master' into devel-3.0

Conflicts:
Build.c
mdadm.c
mdadm.h
super1.c

Build.c	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
Manage.c	diff1 \|	diff2 \|	blob \| history
bitmap.c	diff1 \|	diff2 \|	blob \| history
mdadm.c	diff1 \|	diff2 \|	blob \| history
mdadm.h	diff1 \|	diff2 \|	blob \| history
super1.c	diff1 \|	diff2 \|	blob \| history

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