rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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-01-28 08:59:11 -05:00
parent 48d247d57c 44abf4afe7
commit faccae1ee3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel.spec
View File

@ -743,6 +743,10 @@ Patch30000: pnfs-all-2.6.36-2010-11-03.patch
Patch30001: linux-2.6-pnfs-compile.patch
Patch30002: linux-2.6.35-inline.patch
Patch30000: pnfs-all-2.6.36-2010-11-03.patch
Patch30001: linux-2.6-pnfs-compile.patch
Patch30002: linux-2.6.35-inline.patch
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@ -1367,6 +1371,10 @@ ApplyPatch pnfs-all-2.6.36-2010-11-03.patch
ApplyPatch linux-2.6-pnfs-compile.patch
ApplyPatch linux-2.6.35-inline.patch
ApplyPatch pnfs-all-2.6.36-2010-11-03.patch
ApplyPatch linux-2.6-pnfs-compile.patch
ApplyPatch linux-2.6.35-inline.patch
# END OF PATCH APPLICATIONS
%endif