[kernel/f14/user/steved/pnfs-f14: 56/56] Merge branch 'f14/user/steved/pnfs-f14' of ssh://pkgs.fedoraproject.org/kernel into f14/user/steved/

[Steve Dickson]

commit 853d9328740595d2b3d240b261bf40a1d2388b14
Merge: e3f262c cea8e93
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Sep 29 18:12:31 2010 -0400

    Merge branch 'f14/user/steved/pnfs-f14' of ssh://pkgs.fedoraproject.org/kernel into f14/user/steved/pnfs-f14
    
    Conflicts:
    	kernel.spec

 kernel.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index 461c742,945809d..b53f0b3
--- a/kernel.spec
+++ b/kernel.spec
@@@ -2150,9 -1927,10 +2150,12 @@@ f
  - 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 at redhat.com>
 +- Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
  
+ * Thu Aug 19 2010 Steve Dickson <steved at redhat.com>
+ - Updated to the latest pNFS tag: pnfs-all-2.6.35-2010-08-19
+ 
  * Wed Aug 18 2010 Dave Jones <davej at redhat.com>
  - systemd is dependant upon autofs, so build it in instead of modular.