[mdadm/f15: 2/2] Merge branch 'master' into f15

[Jes Sorensen]

commit 516ce0fac739c9e0b90beb46255dfc397e75a2c9
Merge: daf4e24 7116598
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Wed Mar 28 17:25:48 2012 +0200

    Merge branch 'master' into f15

 ...ental-fix-adding-devices-with-incremental.patch |   49 ++++++++++++++++++++
 mdadm.spec                                         |    8 +++-
 2 files changed, 56 insertions(+), 1 deletions(-)
---
diff --cc mdadm.spec
index cec42b0,23d4410..783e23f
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -107,7 -137,14 +109,11 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * Wed Mar 28 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-7
+ - Fix issue when re-adding drive to a raid1 array with bitmap
+ - Resolves: bz807743 (f17) bz769323 (f16) bz791159 (f15)
+ 
  * Thu Feb 23 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.3-6
  - Fix double free on buggy old kernel sysfs read
  - Fix segfault if trying to write superblock to non existing device