r1037 - trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian

[Simon Horman]

Author: horms
Date: 2004-08-11 23:52:13 -0600 (Wed, 11 Aug 2004)
New Revision: 1037

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
Log:
updated changelog

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-12 05:43:24 UTC (rev 1036)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-12 05:52:13 UTC (rev 1037)
@@ -1,4 +1,4 @@
-kernel-source-2.4.26 (2.4.26-6) unstable; urgency=low
+kernel-source-2.4.26 (2.4.26-6) UNRELEASED; urgency=low
 
   * Fix handling of offset pointers [CAN-2004-0415]
     http://linux.bkbits.net:8080/linux-2.4/cset@1.1465?nav=index.html
@@ -78,6 +78,7 @@
     . drivers/acpi/asus_acpi.c
   * Merged device mapper patch from devmapper-1.00.19
     There was an existing older version of this patch in the tree already
+    (closes: Bug#262870)
     . MAINTAINERS
     . arch/mips64/kernel/ioctl32.c
     . arch/parisc/kernel/ioctl32.c
@@ -102,10 +103,8 @@
     . include/linux/fs.h
     . kernel/ksyms.c
     . mm/filemap.c
-  * Added conflicts for kernel-patch-device-mapper as this
-    patch is in this tree now. (closes: Bug#262870)
 
- -- Simon Horman <horms@debian.org>  Thu, 12 Aug 2004 14:19:41 +0900
+ -- Simon Horman <horms@debian.org>  Thu, 12 Aug 2004 14:49:38 +0900
 
 kernel-source-2.4.26 (2.4.26-5) unstable; urgency=high