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

[Jes Sorensen]

commit 52aef5e94b5543d83f26e64336f151d2d23ce715
Merge: 835ecf6 3010f9b
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Sat Oct 22 17:00:00 2011 +0200

    Merge branch 'master' into f15

 ...emove-race-for-starting-container-devices.patch |   47 ++++++++++++--------
 mdadm.spec                                         |    7 +++-
 2 files changed, 34 insertions(+), 20 deletions(-)
---
diff --cc mdadm.spec
index c8c7903,a3f02d0..1ba6acf
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -107,7 -135,19 +107,12 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * Sat Oct 22 2011 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.2-12
+ - Backport upstream version of fix for IMSM RAID assembly problem,
+   which resolves issues when booting off sysvinit based system.
+ - Resolves: bz736387 (Fedora 15) bz744217 (Fedora 16)
+ 
 -* Wed Oct 19 2011 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.2-11
 -- Fix systemd dependency problem
 -- Resolves: bz741115 (F16) bz744226 (rawhide)
 -
  * Wed Oct 19 2011 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.2-10
  - Fix problem where a dirty IMSM RAID isn't assembled correctly during
    boot, preventing booting from this RAID device.