diff options
| author | NeilBrown <neilb@suse.de> | 2008-12-18 16:56:13 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-12-18 16:56:13 +1100 |
| commit | 8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4 (patch) | |
| tree | 8c09f1ce1ab41c6218a0e4705e3227bc7b7c022b /inventory | |
| parent | b06e30958b6ef4d26497894b2584757b40565d91 (diff) | |
| parent | 3a56f223e94106102eed3fd2b08d3ecad353361b (diff) | |
| download | mdadm-8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4.tar.gz mdadm-8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4.tar.xz mdadm-8a659c33212f85cc0dcecc759b7b36b0bb2b4fe4.zip | |
Merge branch 'master' into devel-3.0
Conflicts:
Assemble.c
Incremental.c
Kill.c
ReadMe.c
inventory
mapfile.c
mdadm.8
mdadm.spec
mdassemble.8
Diffstat (limited to 'inventory')
| -rwxr-xr-x | inventory | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,6 +22,7 @@ ANNOUNCE-2.6.4 ANNOUNCE-2.6.5 ANNOUNCE-2.6.6 ANNOUNCE-2.6.7 +ANNOUNCE-2.6.8 ANNOUNCE-3.0-devel1 ANNOUNCE-3.0-devel2 Assemble.c |