Merge branch 'cluster'

Now that 3.3.3 is out, it is time to include the cluster-support code.

Signed-off-by: NeilBrown <neilb@suse.com>

diff --cc Assemble.c
Simple merge

diff --cc Grow.c
Simple merge

diff --cc Incremental.c
Simple merge

diff --cc Manage.c
Simple merge

diff --cc ReadMe.c
Simple merge

diff --cc bitmap.c
index bbe9baec6baf813a469095e575460eac65c042c9,0c3f6dead591cf40e9351a7f77208bbf3c606cb1..60865bccb8ae9253d1c0f31d66a39929d3975eca
--- 1/bitmap.c
--- 2/bitmap.c
+++ b/bitmap.c
@@@ -32,9 -32,11 +32,11 @@@ static inline void sb_le_to_cpu(bitmap_
        sb->daemon_sleep = __le32_to_cpu(sb->daemon_sleep);
        sb->sync_size = __le64_to_cpu(sb->sync_size);
        sb->write_behind = __le32_to_cpu(sb->write_behind);
+       sb->nodes = __le32_to_cpu(sb->nodes);
+       sb->sectors_reserved = __le32_to_cpu(sb->sectors_reserved);
  }
  
 -inline void sb_cpu_to_le(bitmap_super_t *sb)
 +static inline void sb_cpu_to_le(bitmap_super_t *sb)
  {
        sb_le_to_cpu(sb); /* these are really the same thing */
  }

diff --cc config.c
Simple merge

diff --cc mdadm.8.in
Simple merge

diff --cc mdadm.c
Simple merge

diff --cc mdadm.h
Simple merge