[kernel/f13/user/steved/pnfs-13: 16/27] Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19

[Steve Dickson]

commit 4119d566cce5178e08a1197ea4dd6e3ab0201b57
Author: Steve Dickson <steved at redhat.com>
Date:   Mon Aug 23 12:20:57 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 |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 48cfcf0..0f1213b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -23,7 +23,8 @@ Summary: The Linux kernel
 #
 # (Uncomment the '#' and both spaces below to set the buildid.)
 #
-%define buildid .pnfs34.2010.08.19
+%define buildid .pnfs_all_2.6.35_2010_08_19
+>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
 ###################################################################
 
 # The buildid can also be specified on the rpmbuild command line