diff options
| author | NeilBrown <neilb@suse.de> | 2009-01-08 09:31:28 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2009-01-08 09:31:28 +1100 |
| commit | 78fbcc10312649f2f4f88283e3f19dce9b205733 (patch) | |
| tree | db2596ad62db5b86e1e08a693eb4b5dad2b57d30 /Monitor.c | |
| parent | 45b662b611a6fbbdd018a65b6f205e91df884c37 (diff) | |
| parent | 1a0ee0baf049809f9e67d60bb8158801eada3bd5 (diff) | |
| download | mdadm-78fbcc10312649f2f4f88283e3f19dce9b205733.tar.gz mdadm-78fbcc10312649f2f4f88283e3f19dce9b205733.tar.xz mdadm-78fbcc10312649f2f4f88283e3f19dce9b205733.zip | |
Merge branch 'master' into scratch-3.0
Conflicts:
Assemble.c
config.c
Diffstat (limited to 'Monitor.c')
| -rw-r--r-- | Monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -626,7 +626,7 @@ int Wait(char *dev) free_mdstat(ms); return rv; } - free(ms); + free_mdstat(ms); rv = 0; mdstat_wait(5); } |