summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-10-31 16:59:45 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2010-10-31 16:59:45 (GMT)
commit09bab58031c7d497f6f0f223cd4d68715f904600 (patch)
treeaf599e0f6c8b6b0f5806f783d17e9a79c828b584 /config
parentae27f711023d95715eb8409e4d741973cd3a244e (diff)
parent3e2ca41cb9393cf9b889c11e50a6b924008dc66a (diff)
Merge.
Diffstat (limited to 'config')
-rw-r--r--config/kernel/linux.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index 74b8436..5209f5c 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -30,9 +30,9 @@ config KERNEL_V_2_6_36
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 @@ config KERNEL_V_2_6_33_7
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 @@ config KERNEL_V_2_6_31_14
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 @@ config KERNEL_VERSION
# 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