[kernel] r4905 - in dists/sid/linux-2.6/debian: . patches-debian/series

[maximilian attems]

Author: maks-guest
Date: Fri Nov 25 22:40:27 2005
New Revision: 4905

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4
Log:
baah net-nf_queue-oops.patch conflicts


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Nov 25 22:40:27 2005
@@ -44,8 +44,9 @@
     - Fix memory management error during setting up new advapi sockopts.
     - Fix sending extension headers before and including routing header.
     - hwmon: Fix missing boundary check when setting W83627THF in0 limits
+  * Remove net-nf_queue-oops.patch already included in 2.6.14.3.
 
- -- maximilian attems <maks at sternwelten.at>  Fri, 25 Nov 2005 23:22:52 +0100
+ -- maximilian attems <maks at sternwelten.at>  Fri, 25 Nov 2005 23:39:04 +0100
 
 linux-2.6 (2.6.14-3) unstable; urgency=low
 

Modified: dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4
==============================================================================
--- dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4	(original)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.14-4	Fri Nov 25 22:40:27 2005
@@ -2,4 +2,5 @@
 + setkeys-needs-root-2.patch
 + mm-invalidate_inode_pages2-overflow.patch
 + ctnetlink-check-if-protoinfo-is-present.patch
+- net-nf_queue-oops.patch
 + 2.6.14.3.patch