Merge branch 'fixes' into for-neil

diff --cc managemon.c
Simple merge

diff --cc mdadm.8.in
Simple merge

diff --cc mdadm.c
Simple merge

diff --cc mdadm.h
Simple merge

diff --cc mdmon.c
Simple merge

diff --cc super-ddf.c
Simple merge

diff --cc super-intel.c
Simple merge

diff --cc sysfs.c
Simple merge

diff --cc util.c
Simple merge