Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/mdadm...

diff --cc Assemble.c
Simple merge

diff --cc mdadm.h
Simple merge

diff --cc super-ddf.c
Simple merge

diff --cc super-intel.c
Simple merge

diff --cc super0.c
Simple merge