[kernel/f15] Reinstate some conflicts: that disappeared during the rebase (rhbz 710646)

[Dave Jones]

commit 144f5a9a826508c3c5b991bcc61015344318529b
Author: Dave Jones <davej at redhat.com>
Date:   Wed Aug 31 12:05:50 2011 -0400

    Reinstate some conflicts: that disappeared during the rebase (rhbz 710646)

 kernel.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 2ec686e..b45b599 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -406,7 +406,7 @@ Summary: The Linux kernel
 # First the general kernel 2.6 required versions as per
 # Documentation/Changes
 #
-%define kernel_dot_org_conflicts  ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2
+%define kernel_dot_org_conflicts  ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5
 
 #
 # Then a series of requirements that are distribution specific, either
@@ -1857,6 +1857,9 @@ fi
 # and build.
 
 %changelog
+* Wed Aug 31 2011 Dave Jones <davej at redhat.com>
+- Reinstate some conflicts: that disappeared during the rebase (rhbz 710646)
+
 * Tue Aug 30 2011 Josh Boyer <jwboyer at redhat.com> 2.6.40.4-5
 - Fix kconfig error in patch for rhbz 606017