diff --git a/kernel.spec b/kernel.spec
index 56379a1d7..116e84d7c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -730,6 +730,7 @@ Patch12040: only-use-alpha2-regulatory-information-from-country-IE.patch
 
 Patch12080: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 
+<<<<<<< HEAD
 # rhbz #622149
 Patch12085: fix-rcu_deref_check-warning.patch
 Patch12086: linux-2.6-cgroups-rcu.patch
@@ -777,6 +778,8 @@ Patch13650: drm-i915-sanity-check-pread-pwrite.patch
 Patch13651: kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
 Patch13652: v4l1-fix-32-bit-compat-microcode-loading-translation.patch
 
+=======
+>>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
 Patch13000: pnfs-all-2.6.35-2010-08-19.patch
 Patch13001: linux-2.6-pnfs-compile.patch
 Patch13002: linux-2.6.35-inline.patch
@@ -2330,6 +2333,8 @@ fi
 - Drop merged patches:
    mm-fix-page-table-unmap-for-stack-guard-page-properly.patch
    mm-fix-up-some-user-visible-effects-of-the-stack-guard-page.patch
+* Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
+- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
 
 * Thu Aug 19 2010 Steve Dickson <steved@redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19