From 5c33d3c5c6be45642ad5b5262f13f58dbaeaceb8 Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Mar 23 2011 15:23:49 +0000
Subject: Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/user/steved/pnfs-rawhide


Conflicts:
	kernel.spec

Signed-off-by: Steve Dickson <steved@redhat.com>

---

diff --git a/kernel.spec b/kernel.spec
index 6d37e0e..44ae519 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -731,6 +731,10 @@ Patch30000: pnfs-all-2.6.38-rc3-2011-02-03.patch
 Patch30001: linux-2.6-pnfs-compile.patch
 Patch30002: linux-2.6.35-inline.patch
 
+Patch30000: pnfs-all-2.6.38-rc3-2011-02-03.patch
+Patch30001: linux-2.6-pnfs-compile.patch
+Patch30002: linux-2.6.35-inline.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1360,6 +1364,10 @@ ApplyPatch pnfs-all-2.6.38-rc3-2011-02-03.patch
 ApplyPatch linux-2.6-pnfs-compile.patch
 ApplyPatch linux-2.6.35-inline.patch
 
+ApplyPatch pnfs-all-2.6.38-rc3-2011-02-03.patch
+ApplyPatch linux-2.6-pnfs-compile.patch
+ApplyPatch linux-2.6.35-inline.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif