Merge branch 'mdadm-3.3.x'

author NeilBrown <neilb@suse.com>

Mon, 3 Aug 2015 06:21:37 +0000 (16:21 +1000)

committer NeilBrown <neilb@suse.com>

Mon, 3 Aug 2015 06:21:37 +0000 (16:21 +1000)
author NeilBrown <neilb@suse.com>
Mon, 3 Aug 2015 06:21:37 +0000 (16:21 +1000)
committer NeilBrown <neilb@suse.com>
Mon, 3 Aug 2015 06:21:37 +0000 (16:21 +1000)
diff --cc Assemble.c
Simple merge
diff --cc Incremental.c
Simple merge
diff --cc ReadMe.c
Simple merge
diff --cc mdadm.8.in
Simple merge
author	NeilBrown <neilb@suse.com>
	Mon, 3 Aug 2015 06:21:37 +0000 (16:21 +1000)
committer	NeilBrown <neilb@suse.com>
	Mon, 3 Aug 2015 06:21:37 +0000 (16:21 +1000)
		1	2
Assemble.c	patch \|	diff1 \|	diff2 \|	blob \| history
Incremental.c	patch \|	diff1 \|	diff2 \|	blob \| history
ReadMe.c	patch \|	diff1 \|	diff2 \|	blob \| history
mdadm.8.in	patch \|	diff1 \|	diff2 \|	blob \| history