[kernel/f14/user/steved/pnfs-f14: 90/106] Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19

[Steve Dickson]

commit 2baff9db8b777514cefa36ed01ae6b418a354466
Author: Steve Dickson <steved at redhat.com>
Date:   Thu Aug 19 21:39:23 2010 -0400

    Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 kernel.spec |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 38c3974..f5aa203 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -831,18 +831,10 @@ Patch13703: btrfs-fix-typo-in-fallocate-to-make-it-honor-actual-size.patch
 # rhbz#643758
 Patch13704: hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
 
-Patch13000: pnfs-all-2.6.35-2010-08-24-f14.patch
-Patch13001: linux-2.6-pnfs-compile.patch
-Patch13002: linux-2.6.35-inline.patch
-
 Patch13000: pnfs-all-2.6.35-2010-09-14-f14.patch
 Patch13001: linux-2.6-pnfs-compile.patch
 Patch13002: linux-2.6.35-inline.patch
 
-Patch13000: pnfs-all-2.6.35-2010-08-19.patch
-Patch13001: linux-2.6-pnfs-compile.patch
-Patch13002: linux-2.6.35-inline.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1580,18 +1572,10 @@ ApplyPatch block-check-for-proper-length-of-iov-entries-earlier-in-blk_rq_map_us
 # rhbz#643758
 ApplyPatch hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
 
-ApplyPatch pnfs-all-2.6.35-2010-08-24-f14.patch
-ApplyPatch linux-2.6-pnfs-compile.patch
-ApplyPatch linux-2.6.35-inline.patch
-
 ApplyPatch pnfs-all-2.6.35-2010-09-14-f14.patch
 ApplyPatch linux-2.6-pnfs-compile.patch
 ApplyPatch linux-2.6.35-inline.patch
 
-ApplyPatch pnfs-all-2.6.35-2010-08-19.patch
-ApplyPatch linux-2.6-pnfs-compile.patch
-ApplyPatch linux-2.6.35-inline.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2672,9 +2656,12 @@ fi
    mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
 * Thu Aug 19 2010 Steve Dickson <steved at redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
+<<<<<<< HEAD
 
 * Thu Aug 19 2010 Steve Dickson <steved at redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
+=======
+>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
 
 * Thu Aug 19 2010 Steve Dickson <steved at redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19