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: c64881d d6508f0)

author	NeilBrown <neilb@suse.de>
	Thu, 10 Mar 2011 06:37:04 +0000 (17:37 +1100)
committer	NeilBrown <neilb@suse.de>
	Thu, 10 Mar 2011 06:37:04 +0000 (17:37 +1100)
commit	ca6529edf6f7216003863a9ea847e6689693bd96
tree	ed3091b74e94cfec89134b9ed6701fc1c4e8a69e	tree \| snapshot
parent	c64881d7a2a01e50b2275f5a0a9272bfc953e8a2	commit \| diff
parent	d6508f0cfb60edf07b36f1532eae4d9cddf7178b	commit \| diff

Merge branch 'master' into devel-3.2

Conflicts:
Grow.c
Manage.c
managemon.c
mdadm.8.in
util.c

ReadMe.c	diff1 \|	diff2 \|	blob \| history
super-ddf.c	diff1 \|	diff2 \|	blob \| history
super0.c	diff1 \|	diff2 \|	blob \| history
super1.c	diff1 \|	diff2 \|	blob \| history

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