Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0
authorNeilBrown <neilb@suse.de>
Tue, 14 Apr 2009 01:11:14 +0000 (11:11 +1000)
committerNeilBrown <neilb@suse.de>
Tue, 14 Apr 2009 01:11:14 +0000 (11:11 +1000)
commitc256924e52249b52bad42963176c42601f1a08f4
tree703992c9f376f272232395997a1a74faa58d6f15
parentfa5090285af9401f950aa5c1a3a82708c69c4906
parent7e7fffc4022114c491587755998395ef4766fcc2
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.
Grow.c
mapfile.c
mdadm.h
super-ddf.c
sysfs.c