]> git.ipfire.org Git - thirdparty/mdadm.git/commit
Merge branch 'subarray' into for-neil
authorDan Williams <dan.j.williams@intel.com>
Fri, 2 Jul 2010 00:36:05 +0000 (17:36 -0700)
committerDan Williams <dan.j.williams@intel.com>
Fri, 2 Jul 2010 00:36:05 +0000 (17:36 -0700)
commit8cfc801c72f079618b39d04c2e0fe32adbc2474e
tree061c0e2348bd7fab99ca774fbcf758ebf997ae06
parent6a0ee6a0770e8b2ae2a2bbe79896d4ecb083e218
parentaa534678baad80689a642ba1bd602a00a267ac03
Merge branch 'subarray' into for-neil

Conflicts:
mdadm.h
super-intel.c
mdadm.8
mdadm.h
super-intel.c