From: NeilBrown <neilb@suse.de>
Date: Thu, 24 Mar 2011 01:00:55 +0000 (+1100)
Subject: Merge branch 'master' into devel-3.2
X-Git-Tag: mdadm-3.2.1~8
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fmdadm.git;a=commitdiff_plain;h=51d9a2ce33a6a60a75751a46bb93bf052a2dfc7a

Merge branch 'master' into devel-3.2

Conflicts:
	Incremental.c
	Manage.c
	ReadMe.c
	inventory
	mdadm.8.in
	mdadm.spec
	mdassemble.8
	mdmon.8
---

51d9a2ce33a6a60a75751a46bb93bf052a2dfc7a
diff --cc inventory
index d9600998,d05eb3c3..d630f7a4
--- a/inventory
+++ b/inventory
@@@ -8,7 -8,7 +8,8 @@@ ANNOUNCE-3.1.
  ANNOUNCE-3.1.2
  ANNOUNCE-3.1.3
  ANNOUNCE-3.1.4
+ ANNOUNCE-3.1.5
 +ANNOUNCE-3.2
  Assemble.c
  bitmap.c
  bitmap.h