Dan Williams: Merge branch 'subarray' into for-neil

[Martin F. Krafft]

Module: mdadm
Branch: upstream
Commit: 8cfc801c72f079618b39d04c2e0fe32adbc2474e
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=8cfc801c72f079618b39d04c2e0fe32adbc2474e

Author: Dan Williams <dan.j.williams at intel.com>
Date:   Thu Jul  1 17:36:05 2010 -0700

Merge branch 'subarray' into for-neil

Conflicts:
	mdadm.h
	super-intel.c

---