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

[Jes Sorensen]

commit 3337851907518575996dbd88fd3aa04beaf8dd68
Merge: f18b34a 878e56c
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Mon May 21 12:17:38 2012 +0200

    Merge branch 'master' into f15

 .gitignore |    1 +
 mdadm.spec |   10 ++++++----
 sources    |    1 +
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc mdadm.spec
index 1774c4d,7046d2a..c004840
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -8,8 -8,9 +8,7 @@@ Source2:     raid-chec
  Source3:     mdadm.rules
  Source4:     mdadm-raid-check-sysconfig
  Source5:     mdadm-cron
 -Source6:     mdmonitor.service
 -Source7:     mdmonitor-takeover.service
  Source8:     mdadm.conf
- Patch1:	     mdadm-3.2.4-super1-fix-choice-of-data_offset.patch
  # Fedora customization patches
  Patch97:     mdadm-3.2.3-udev.patch
  Patch98:     mdadm-2.5.2-static.patch
@@@ -98,7 -124,14 +96,11 @@@ f
  %dir %{_localstatedir}/run/%{name}/
  %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
  
 -%files sysvinit
 -%{_initrddir}/*
 -
  %changelog
+ * Mon May 21 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.5-1
+ - Upgrade to mdadm-3.2.5
+ - Resolves bz822850
+ 
  * Tue May 15 2012 Jes Sorensen <Jes.Sorensen at redhat.com> - 3.2.4-3
  - Fix mdadm-3.2.4 introduced bug where --add fails in common cases
  - Resolves bz821717 (f17) bz821718 (f16) bz821719 (f15)