diff options
| author | NeilBrown <neilb@suse.de> | 2011-03-24 12:00:55 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-03-24 12:00:55 +1100 |
| commit | 51d9a2ce33a6a60a75751a46bb93bf052a2dfc7a (patch) | |
| tree | 6f6afb83f9466acdab298de5ea276ac6475ef543 /inventory | |
| parent | b4add146a02286102916a815f2ed0ba3f76cfd7b (diff) | |
| parent | 945f0fcd0179210ae5b72006c3621a73cc6e9205 (diff) | |
| download | mdadm-51d9a2ce33a6a60a75751a46bb93bf052a2dfc7a.tar.gz | |
Merge branch 'master' into devel-3.2
Conflicts:
Incremental.c
Manage.c
ReadMe.c
inventory
mdadm.8.in
mdadm.spec
mdassemble.8
mdmon.8
Diffstat (limited to 'inventory')
| -rwxr-xr-x | inventory | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -8,6 +8,7 @@ ANNOUNCE-3.1.1 ANNOUNCE-3.1.2 ANNOUNCE-3.1.3 ANNOUNCE-3.1.4 +ANNOUNCE-3.1.5 ANNOUNCE-3.2 Assemble.c bitmap.c |