Merge branch 'master' into devel-3.0

Conflicts:

	Create.c
	Manage.c

1 files changed, 1 insertions, 1 deletions

diff --git a/mdadm.h b/mdadm.h
index ed0c1153..5604a671 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -274,7 +274,7 @@ typedef struct mddev_dev_s {
 	char disposition;	/* 'a' for add, 'r' for remove, 'f' for fail.
 				 * Not set for names read from .config
 				 */
-	char writemostly;
+	char writemostly;	/* 1 for 'set writemostly', 2 for 'clear writemostly' */
 	char re_add;
 	char used;		/* set when used */
 	struct mddev_dev_s *next;