Merge branch 'master' into devel-3.0
authorNeil Brown <neilb@suse.de>
Thu, 19 Jun 2008 06:38:37 +0000 (16:38 +1000)
committerNeil Brown <neilb@suse.de>
Thu, 19 Jun 2008 06:38:37 +0000 (16:38 +1000)
commit370ac380fda9fb0d813f210ed2b342cfbde07cf0
tree79680600bef18504fc82362fe3134d2b316f44ab
parent94f8ae072f885eac63fa45a3f8573a2c17a5bf7b
parent60b435db5a7b085ad1204168879037bf14ebd6d1
Merge branch 'master' into devel-3.0

Conflicts:

Makefile
Assemble.c
Makefile
ReadMe.c
mdadm.c
super0.c