diff options
author | NeilBrown <neilb@suse.de> | 2009-04-14 11:11:14 +1000 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2009-04-14 11:11:14 +1000 |
commit | c256924e52249b52bad42963176c42601f1a08f4 (patch) | |
tree | 703992c9f376f272232395997a1a74faa58d6f15 /mdassemble.c | |
parent | fa5090285af9401f950aa5c1a3a82708c69c4906 (diff) | |
parent | 7e7fffc4022114c491587755998395ef4766fcc2 (diff) | |
download | mdadm-c256924e52249b52bad42963176c42601f1a08f4.tar.gz mdadm-c256924e52249b52bad42963176c42601f1a08f4.tar.xz mdadm-c256924e52249b52bad42963176c42601f1a08f4.zip |
Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0
Conflicts:
Grow.c
mdadm.h
sysfs.c
Due to independent fixes for the "mdadm hangs if reshape finishes too quickly"
problem.
Diffstat (limited to 'mdassemble.c')
0 files changed, 0 insertions, 0 deletions