From d48799e476d3f1d1a39d4eac5c8589bb659f794d Mon Sep 17 00:00:00 2001
From: Steve Dickson <steved@redhat.com>
Date: Nov 01 2010 13:33:59 +0000
Subject: Merge branch 'f13/user/steved/pnfs-13' of ssh://pkgs.fedoraproject.org/kernel into f13/user/steved/pnfs-13


Conflicts:
	kernel.spec

---

diff --git a/kernel.spec b/kernel.spec
index 0062f9b..723c2ca 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2360,6 +2360,9 @@ fi
 * Tue Aug 31 2010 Steve Dickson <steved@redhat.com>
 - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
 
+* Tue Aug 31 2010 Steve Dickson <steved@redhat.com>
+- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-24
+
 * Fri Aug 27 2010 Chuck Ebbert <cebbert@redhat.com>  2.6.34.6-47
 - Linux 2.6.34.6
 - drivers-hwmon-coretemp-c-detect-the-thermal-sensors-by-cpuid.patch (#625734)