git://git.onelab.eu
/
linux-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ab00dc7
)
Backed out 595, to be reimplemented.
author
Sapan Bhatia
<sapanb@cs.princeton.edu>
Thu, 20 Mar 2008 17:30:06 +0000
(17:30 +0000)
committer
Sapan Bhatia
<sapanb@cs.princeton.edu>
Thu, 20 Mar 2008 17:30:06 +0000
(17:30 +0000)
kernel-2.6.spec
patch
|
blob
|
history
diff --git
a/kernel-2.6.spec
b/kernel-2.6.spec
index
85e8e4c
..
e31c5bb
100644
(file)
--- a/
kernel-2.6.spec
+++ b/
kernel-2.6.spec
@@
-336,7
+336,7
@@
KERNEL_PREVIOUS=vanilla
%ApplyPatch 592
%ApplyPatch 593
%ApplyPatch 594
-%ApplyPatch 595
+
#
%ApplyPatch 595
%endif
# NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may