# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1288544385 -3600
# Node ID 4534da2b2bc1e54db8efe203997fde0c22e0d978
# Parent  96082aa6459f11d1105a4c9af5c4652883494a6e# Parent  53aa2773dd80dd8e40e2a2bc4ef03d1a99104df8
Merge.

diff -r 96082aa6459f -r 4534da2b2bc1 config/kernel/linux.in
--- a/config/kernel/linux.in	Sun Oct 31 16:50:07 2010 +0100
+++ b/config/kernel/linux.in	Sun Oct 31 17:59:45 2010 +0100
@@ -30,9 +30,9 @@
     bool
     prompt "2.6.36"
 
-config KERNEL_V_2_6_35_7
+config KERNEL_V_2_6_35_8
     bool
-    prompt "2.6.35.7"
+    prompt "2.6.35.8"
 
 config KERNEL_V_2_6_34_7
     bool
@@ -42,9 +42,9 @@
     bool
     prompt "2.6.33.7"
 
-config KERNEL_V_2_6_32_24
+config KERNEL_V_2_6_32_25
     bool
-    prompt "2.6.32.24 (long-term stable)"
+    prompt "2.6.32.25 (long-term stable)"
     help
       The Linux 2.6.32 tree is the current "long-term stable" maintenance branch.
       It is intended to fill the niche for users who are not using distribution
@@ -64,9 +64,9 @@
     bool
     prompt "2.6.31.14"
 
-config KERNEL_V_2_6_27_54
+config KERNEL_V_2_6_27_55
     bool
-    prompt "2.6.27.54 (old long-term stable)"
+    prompt "2.6.27.55 (old long-term stable)"
     help
       The Linux 2.6.27 tree is the previous "long-term stable" maintenance branch.
       It is intended to fill the niche for users who are not using distribution
@@ -102,12 +102,12 @@
 # Don't remove next line
 # CT_INSERT_VERSION_STRING_BELOW
     default "2.6.36" if KERNEL_V_2_6_36
-    default "2.6.35.7" if KERNEL_V_2_6_35_7
+    default "2.6.35.8" if KERNEL_V_2_6_35_8
     default "2.6.34.7" if KERNEL_V_2_6_34_7
     default "2.6.33.7" if KERNEL_V_2_6_33_7
-    default "2.6.32.24" if KERNEL_V_2_6_32_24
+    default "2.6.32.25" if KERNEL_V_2_6_32_25
     default "2.6.31.14" if KERNEL_V_2_6_31_14
-    default "2.6.27.54" if KERNEL_V_2_6_27_54
+    default "2.6.27.55" if KERNEL_V_2_6_27_55
 
 choice
     bool