r4176 - dists/trunk/linux-2.6/debian

[Simon Horman]

Author: horms
Date: 2005-09-12 07:59:14 +0000 (Mon, 12 Sep 2005)
New Revision: 4176

Modified:
   dists/trunk/linux-2.6/debian/changelog
Log:
Move 2.6.12-7 change log into 2.6.13-1

Modified: dists/trunk/linux-2.6/debian/changelog
===================================================================
--- dists/trunk/linux-2.6/debian/changelog	2005-09-12 05:00:38 UTC (rev 4175)
+++ dists/trunk/linux-2.6/debian/changelog	2005-09-12 07:59:14 UTC (rev 4176)
@@ -18,21 +18,15 @@
   * Disable BSDv3 accounting on hppa and alpha, it was already
     disabled on all other architectures. Also unify BSD accounting
     config into top level config, rather than per flavour configs.
+  * [SECURITY] The seq_file memory leak fix included in 2.6.12-6
+    as part of upstream's 2.6.12.6 patchset is now CAN-2005-2800.
 
   [ Jurij Smakov, Simon Horman ]
   * Ensure that only one kernel-manual/linux-manual package can
     be installed at a time to avoid file conflicts. (closes: #320042)
 
- -- Simon Horman <horms at debian.org>  Mon, 12 Sep 2005 12:31:17 +0900
+ -- Simon Horman <horms at debian.org>  Mon, 12 Sep 2005 16:56:59 +0900
 
-linux-2.6 (2.6.12-7) UNRELEASED; urgency=low
-
-  [ Simon Horman ]
-  * [SECURITY] THe seq_file memory leak fix included in 2.6.12-6
-    as part of upstream's 2.6.12.6 patchset is now CAN-2005-2800.
-
- -- Simon Horman <horms at debian.org>  Mon, 12 Sep 2005 11:01:38 +0900
-
 linux-2.6 (2.6.12-6) unstable; urgency=high
 
   [ Andres Salomon, Bastian Blank ]