Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19

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

kernel.spec

@@ -1431,7 +1431,6 @@ ApplyPatch libata-it821x-dump-stack-on-cache-flush.patch
 # temporary fix for typo in Xen -stable patch
 ApplyPatch xen-fix-typo-in-xen-irq-fix.patch
 
-<<<<<<< HEAD
 # rhbz#641468
 ApplyPatch pnpacpi-cope-with-invalid-device-ids.patch
 
@@ -1463,10 +1462,7 @@ ApplyPatch kvm-fix-fs-gs-reload-oops-with-invalid-ldt.patch
 # CVE-2010-2963
 ApplyPatch v4l1-fix-32-bit-compat-microcode-loading-translation.patch
 
-ApplyPatch pnfs-all-2.6.35-2010-08-24-f14.patch
-=======
 ApplyPatch pnfs-all-2.6.35-2010-09-14-f14.patch
->>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-09-14
 ApplyPatch linux-2.6-pnfs-compile.patch
 ApplyPatch linux-2.6.35-inline.patch
 
@@ -2056,7 +2052,6 @@ fi
 # and build.
 
 %changelog
-<<<<<<< HEAD
 * Tue Nov 02 2010 Ben Skeggs <bskeggs@redhat.com> 2.6.35.6-50
 - nouveau: add potential workaround for NV86 hardware quirk
 - fix issue that occurs in certain dual-head configurations (rhbz#641524)
@@ -2165,10 +2160,9 @@ fi
 
 * Wed Sep 29 2010 Dave Jones <davej@redhat.com> 2.6.35.6-35
 - Add back an old hack to make an SDV e1000e variant work.
-=======
+
 * Thu Sep 30 2010 Steve Dickson <steved@redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-09-14
->>>>>>> Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-09-14
 
 * Wed Sep 29 2010 Dave Jones <davej@redhat.com>
 - Enable IB700 watchdog (used by qemu/kvm). (#637152)
@@ -2355,6 +2349,9 @@ fi
 * 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
+
 * Wed Aug 18 2010 Dave Jones <davej@redhat.com>
 - systemd is dependant upon autofs, so build it in instead of modular.