Merge branch 'master' of git://github.com/djbw/mdadm

diff --cc Create.c
Simple merge

diff --cc Manage.c
Simple merge

diff --cc mdadm.h
Simple merge

diff --cc super-ddf.c
Simple merge

diff --cc util.c
Simple merge