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

[Steve Dickson]

commit a0798f575a440d0331a053dbc1a0f1bfba956998
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Aug 31 21:17:17 2010 -0400

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

 kernel.spec |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index ca94286..f9be2fe 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -23,7 +23,7 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to set the buildid.)
 #
-%define buildid .pnfs35.2010.08.19
+%define buildid .pnfs35.2010.08.24
 ###################################################################
 
 # The buildid can also be specified on the rpmbuild command line
@@ -833,7 +833,7 @@ Patch13704: hostap_cs-fix-sleeping-function-called-from-invalid-context.patch
 Patch13000: pnfs-all-2.6.35-2010-09-14-f14.patch
 Patch13652: v4l1-fix-32-bit-compat-microcode-loading-translation.patch
 
-Patch13000: pnfs-all-2.6.35-2010-08-19.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
 
@@ -1489,7 +1489,6 @@ ApplyPatch only-use-alpha2-regulatory-information-from-country-IE.patch
 # bz 610941
 ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 
-<<<<<<< HEAD
 # bz 622149
 ApplyPatch fix-rcu_deref_check-warning.patch
 ApplyPatch linux-2.6-cgroups-rcu.patch
@@ -1585,9 +1584,7 @@ ApplyPatch pnfs-all-2.6.35-2010-09-14-f14.patch
 # CVE-2010-2963
 ApplyPatch v4l1-fix-32-bit-compat-microcode-loading-translation.patch
 
-=======
->>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
-ApplyPatch pnfs-all-2.6.35-2010-08-19.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