Merge branch 'subarray' into for-neil

Conflicts:
	mdadm.h
	super-intel.c

1 files changed, 2 insertions, 0 deletions

diff --git a/ReadMe.c b/ReadMe.c
index 9d5a2112..fa333109 100644
--- a/ReadMe.c
+++ b/ReadMe.c
@@ -108,6 +108,8 @@ struct option long_options[] = {
     {"examine-bitmap", 0, 0, 'X'},
     {"auto-detect", 0, 0, AutoDetect},
     {"detail-platform", 0, 0, DetailPlatform},
+    {"kill-subarray", 1, 0, KillSubarray},
+    {"update-subarray", 1, 0, UpdateSubarray},
 
     /* synonyms */
     {"monitor",   0, 0, 'F'},