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@redhat.com>
This commit is contained in:
Steve Dickson 2011-03-23 11:23:49 -04:00
commit 5c33d3c5c6
1 changed files with 8 additions and 0 deletions

View File

@ -731,6 +731,10 @@ 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
@ -1360,6 +1364,10 @@ 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