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

[Steve Dickson]

commit 5c33d3c5c6be45642ad5b5262f13f58dbaeaceb8
Merge: 72ff16b 9303a91
Author: Steve Dickson <steved at redhat.com>
Date:   Wed Mar 23 11:23:49 2011 -0400

    Merge branch 'rawhide/user/steved/pnfs-rawhide' of ssh://pkgs.fedoraproject.org/kernel into rawhide/user/steved/pnfs-rawhide
    
    Conflicts:
    	kernel.spec
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

 kernel.spec |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --cc kernel.spec
index 6d37e0e,c450326..44ae519
--- a/kernel.spec
+++ b/kernel.spec
@@@ -725,12 -729,24 +725,16 @@@ Patch12205: runtime_pm_fixups.patc
  
  Patch12303: dmar-disable-when-ricoh-multifunction.patch
  
 -Patch12421: fs-call-security_d_instantiate-in-d_obtain_alias.patch
 -
 -Patch12430: can-softing-depend-on-iomem.patch
 +Patch12305: xhci_hcd-suspend-resume.patch
  
 -# rhbz#673857
 -Patch12432: hfsplus-01-dont-leak-buffer.patch
 -Patch12434: hfsplus-03-zero-vhdr-on-free.patch
 -Patch12436: hfsplus-05-fix-failed-mount.patch
 -
 -# rhbz#607499
 -Patch12437: atl1c-add-missing-pci-id.patch
 -
 -Patch12438: ath5k-fix-fast-channel-change.patch
 +Patch30000: pnfs-all-2.6.38-rc3-2011-02-03.patch
 +Patch30001: linux-2.6-pnfs-compile.patch
 +Patch30002: linux-2.6.35-inline.patch
  
+ Patch30000: pnfs-all-2.6.38-rc3-2011-02-03.patch
+ Patch30001: linux-2.6-pnfs-compile.patch
+ Patch30002: linux-2.6.35-inline.patch
+ 
  %endif
  
  BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@@ -1354,12 -1356,28 +1358,16 @@@ ApplyPatch acpi_reboot.patc
  # rhbz#605888
  ApplyPatch dmar-disable-when-ricoh-multifunction.patch
  
 -# rhbz#662344,600690
 -ApplyPatch fs-call-security_d_instantiate-in-d_obtain_alias.patch
 -
 -# Fix build failure on s390
 -# accepted upstream
 -ApplyPatch can-softing-depend-on-iomem.patch
 -
 -# rhbz#673857
 -ApplyPatch hfsplus-01-dont-leak-buffer.patch
 -ApplyPatch hfsplus-03-zero-vhdr-on-free.patch
 -ApplyPatch hfsplus-05-fix-failed-mount.patch
 -
 -# rhbz#607499
 -ApplyPatch atl1c-add-missing-pci-id.patch
 +ApplyPatch xhci_hcd-suspend-resume.patch
  
 -# rhbz#672778
 -ApplyPatch ath5k-fix-fast-channel-change.patch
 +ApplyPatch pnfs-all-2.6.38-rc3-2011-02-03.patch
 +ApplyPatch linux-2.6-pnfs-compile.patch
 +ApplyPatch linux-2.6.35-inline.patch
  
+ ApplyPatch pnfs-all-2.6.38-rc3-2011-02-03.patch
+ ApplyPatch linux-2.6-pnfs-compile.patch
+ ApplyPatch linux-2.6.35-inline.patch
+ 
  # END OF PATCH APPLICATIONS
  
  %endif