[kernel] r12093 - in dists/sid/linux-2.6/debian: . config/i386/vserver

[Bastian Blank]

Author: waldi
Date: Mon Aug 18 08:26:19 2008
New Revision: 12093

Log:
* debian/changelog: Update.
* debian/config/i386/vserver/defines: Add 686-bigmem flavour.


Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/i386/vserver/defines

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon Aug 18 08:26:19 2008
@@ -4,6 +4,8 @@
   * Disable Emagic Audiowerk 2 soundcard support. The PCI IDs clashes with
     many DVB cards.
   * Update VServer patch to 2.3.0.35.
+  * [armel/versatile] Override ABI changes.
+  * [i386/686-bigmem] Add VServer image.
 
   [ Aurelien Jarno ]
   * [armel/versatile] Disable CONFIG_NO_HZ, CONFIG_HIGH_RES_TIMERS for
@@ -17,9 +19,6 @@
     - net: Preserve netfilter attributes in skb_gso_segment using
       __copy_skb_header (Herbert Xu)
 
-  [ Bastian Blank ]
-  * [armel/versatile] Override ABI changes.
-
   [ dann frazier ]
   * [amd64] Fix typo in TOM2 mask value, preventing a hang on some opteron
     systems. (closes: #494365)

Modified: dists/sid/linux-2.6/debian/config/i386/vserver/defines
==============================================================================
--- dists/sid/linux-2.6/debian/config/i386/vserver/defines	(original)
+++ dists/sid/linux-2.6/debian/config/i386/vserver/defines	Mon Aug 18 08:26:19 2008
@@ -1,6 +1,7 @@
 [base]
 flavours:
  686
+ 686-bigmem
 
 [image]
 recommends: util-vserver, libc6-i686