SPECS (LINUX_2_6): kernel.spec - no netfilter set, sorry, big conf...

[baggins]

Author: baggins                      Date: Mon Aug 13 14:46:43 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- no netfilter set, sorry, big conflict on headers

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1756 -> 1.441.2.1757) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1756 SPECS/kernel.spec:1.441.2.1757
--- SPECS/kernel.spec:1.441.2.1756	Mon Aug 13 15:43:36 2007
+++ SPECS/kernel.spec	Mon Aug 13 16:46:38 2007
@@ -789,7 +789,7 @@
 %patch18 -p1
 
 # kernel-pom-ng-set.patch
-%patch12 -p1
+#patch12 -p1
 
 # kernel-pom-ng-connlimit.patch
 %patch19 -p1
@@ -1602,6 +1602,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1757  2007/08/13 14:46:38  baggins
+- no netfilter set, sorry, big conflict on headers
+
 Revision 1.441.2.1756  2007/08/13 13:43:36  baggins
 - apply set after IPMARK
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1756&r2=1.441.2.1757&f=u