# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1274216348 -7200
# Node ID 583c6e1510f5d99984a50ddab2d06fb19e1c1f2e
# Parent  838fb48dcd0081d6cf20347574de9f758fc7c789# Parent  492937e513a08500404d42fcc7c52146f6d91587
Merge.

diff -r 838fb48dcd00 -r 583c6e1510f5 config/kernel/linux.in
--- a/config/kernel/linux.in	Tue May 18 22:58:49 2010 +0200
+++ b/config/kernel/linux.in	Tue May 18 22:59:08 2010 +0200
@@ -34,14 +34,6 @@
 # Don't remove next line
 # CT_INSERT_VERSION_BELOW
 
-config KERNEL_V_2_6_33_4
-    bool
-    prompt "2.6.33.4"
-
-config KERNEL_V_2_6_33_3
-    bool
-    prompt "2.6.33.3"
-
 config KERNEL_V_2_6_33_2
     bool
     prompt "2.6.33.2"
@@ -54,9 +46,9 @@
     bool
     prompt "2.6.33"
 
-config KERNEL_V_2_6_32_13
+config KERNEL_V_2_6_32_11
     bool
-    prompt "2.6.32.13"
+    prompt "2.6.32.11"
 
 config KERNEL_V_2_6_31_13
     bool
@@ -66,6 +58,16 @@
     bool
     prompt "2.6.30.10"
 
+config KERNEL_V_2_6_29_6
+    bool
+    prompt "2.6.29.6 (OBSOLETE)"
+    depends on OBSOLETE
+
+config KERNEL_V_2_6_28_10
+    bool
+    prompt "2.6.28.10 (OBSOLETE)"
+    depends on OBSOLETE
+
 config KERNEL_V_2_6_27_46
     bool
     prompt "2.6.27.46 (long-term stable)"
@@ -89,14 +91,14 @@
     string
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
-    default "2.6.33.4" if KERNEL_V_2_6_33_4
-    default "2.6.33.3" if KERNEL_V_2_6_33_3
     default "2.6.33.2" if KERNEL_V_2_6_33_2
     default "2.6.33.1" if KERNEL_V_2_6_33_1
     default "2.6.33" if KERNEL_V_2_6_33
-    default "2.6.32.13" if KERNEL_V_2_6_32_13
+    default "2.6.32.11" if KERNEL_V_2_6_32_11
     default "2.6.31.13" if KERNEL_V_2_6_31_13
     default "2.6.30.10" if KERNEL_V_2_6_30_10
+    default "2.6.29.6" if KERNEL_V_2_6_29_6
+    default "2.6.28.10" if KERNEL_V_2_6_28_10
     default "2.6.27.46" if KERNEL_V_2_6_27_46
 
 choice