diff options
author | NeilBrown <neilb@suse.de> | 2009-06-02 15:28:36 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-06-02 15:28:36 +1000 |
commit | 3b435195fc34ba447c8ca8fa2f90cd6d5ad88cdb (patch) | |
tree | ef736cccca9d0c9053dc6437f7d229dfcdd9b23f /mdadm.conf-example | |
parent | 38a07ed61e58320e18a6c25ab9da4d749d43bdc5 (diff) | |
parent | c7b474474c793e9a82bd0d84868fdf7367c89696 (diff) | |
download | mdadm-3b435195fc34ba447c8ca8fa2f90cd6d5ad88cdb.tar.gz mdadm-3b435195fc34ba447c8ca8fa2f90cd6d5ad88cdb.tar.xz mdadm-3b435195fc34ba447c8ca8fa2f90cd6d5ad88cdb.zip |
Merge branch 'master' into devel-3.0
Conflicts:
super0.c
super1.c
Diffstat (limited to 'mdadm.conf-example')
0 files changed, 0 insertions, 0 deletions