Merge branch 'master' into devel-3.0
authorNeilBrown <neilb@suse.de>
Mon, 11 May 2009 06:05:41 +0000 (16:05 +1000)
committerNeilBrown <neilb@suse.de>
Mon, 11 May 2009 06:05:41 +0000 (16:05 +1000)
commit8320878543bb5e49b5acb24fa919ff11be485c61
tree299b6ca3d559d818f4b8dd25756c3f5feda0e91f
parent9a40c32728dceb66bac603e96656223944b6c7d4
parentc9f39c1b9bafbd18ce3831c8da6865b21827fef3
Merge branch 'master' into devel-3.0

Conflicts:
Build.c
mdadm.c
mdadm.h
super1.c
Build.c
Makefile
Manage.c
bitmap.c
mdadm.c
mdadm.h
super1.c