r2881 - trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian

[Andres Salomon]

Author: dilinger
Date: 2005-04-03 01:53:57 +0000 (Sun, 03 Apr 2005)
New Revision: 2881

Modified:
   trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog
Log:
merge 2.6.11-1 and 2.6.11-2


Modified: trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog	2005-04-03 01:31:43 UTC (rev 2880)
+++ trunk/kernel/i386/kernel-image-2.6.11-i386-2.6.11/debian/changelog	2005-04-03 01:53:57 UTC (rev 2881)
@@ -1,24 +1,18 @@
 kernel-image-2.6.11-i386 (2.6.11-2) UNRELEASED; urgency=low
 
+  * Build against 2.6.11-2 (Andres Salomon)
   * Fix up AMD descriptions to include CPU name. 
     Thanks to J. Grant. (Simon Horman)
   * Removed "for those who want the latest ..." from header
     package descriptons as this is what packages from
     kernel-latest-2.6-i386 do. (Simon Horman)
-  * Build against kernel-tree-2.6.11-2. (Simon Horman)
-
- -- Simon Horman <horms@debian.org>  Wed, 23 Mar 2005 17:22:58 +0900
-
-kernel-image-2.6.11-i386 (2.6.11-1) unstable; urgency=low
-
-  * Build against 2.6.11-1.
   * Add a virtual package kernel-headers-2.6.11-1-i386, that simply
     depends upon all other i386 k-h packages; useful for binary module
-    packages to build-dep upon.
-  * Mention the removal of the tg3 driver in NEWS.Debian.
-  * Disable CONFIG_PREEMPT.
+    packages to build-dep upon (Andres Salomon)
+  * Mention the removal of the tg3 driver in NEWS.Debian (Andres Salomon).
+  * Disable CONFIG_PREEMPT (Andres Salomon).
 
- -- Andres Salomon <dilinger@debian.org>  Mon, 21 Mar 2005 05:59:20 -0500
+ -- Andres Salomon <dilinger@debian.org>  
 
 kernel-image-2.6.10-i386 (2.6.10-6) unstable; urgency=low