Merge branch 'master' of git://github.com/djbw/mdadm into devel-3.0

Conflicts:
	Grow.c
	mdadm.h
	sysfs.c
Due to independent fixes for the "mdadm hangs if reshape finishes too quickly"
problem.

diff --cc Grow.c
index fc809c63a68d03d8121a97d9a601fc88ca2cf22d,7083c184c51456b24255cfea9a8af7f5cdc14758..15cec5f103bf874bdb4669a97086dce333089bee
--- 1/Grow.c
--- 2/Grow.c
+++ b/Grow.c
@@@ -809,6 -809,8 +809,7 @@@ int Grow_reshape(char *devname, int fd
                /* wait for reshape to pass the critical region */
                while(1) {
                        unsigned long long comp;
 -                      char a[20];
+ 
                        if (sysfs_get_ll(sra, NULL, "sync_completed", &comp)<0) {
                                sleep(5);
                                break;

diff --cc mapfile.c
Simple merge

diff --cc mdadm.h
Simple merge

diff --cc super-ddf.c
Simple merge

diff --cc sysfs.c
Simple merge