Merge.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Oct 31 17:59:45 2010 +0100 (2010-10-31)
changeset 21644534da2b2bc1
parent 2163 96082aa6459f
parent 2160 53aa2773dd80
child 2165 e67ab7a73b2f
Merge.
     1.1 --- a/config/kernel/linux.in	Sun Oct 31 16:50:07 2010 +0100
     1.2 +++ b/config/kernel/linux.in	Sun Oct 31 17:59:45 2010 +0100
     1.3 @@ -30,9 +30,9 @@
     1.4      bool
     1.5      prompt "2.6.36"
     1.6  
     1.7 -config KERNEL_V_2_6_35_7
     1.8 +config KERNEL_V_2_6_35_8
     1.9      bool
    1.10 -    prompt "2.6.35.7"
    1.11 +    prompt "2.6.35.8"
    1.12  
    1.13  config KERNEL_V_2_6_34_7
    1.14      bool
    1.15 @@ -42,9 +42,9 @@
    1.16      bool
    1.17      prompt "2.6.33.7"
    1.18  
    1.19 -config KERNEL_V_2_6_32_24
    1.20 +config KERNEL_V_2_6_32_25
    1.21      bool
    1.22 -    prompt "2.6.32.24 (long-term stable)"
    1.23 +    prompt "2.6.32.25 (long-term stable)"
    1.24      help
    1.25        The Linux 2.6.32 tree is the current "long-term stable" maintenance branch.
    1.26        It is intended to fill the niche for users who are not using distribution
    1.27 @@ -64,9 +64,9 @@
    1.28      bool
    1.29      prompt "2.6.31.14"
    1.30  
    1.31 -config KERNEL_V_2_6_27_54
    1.32 +config KERNEL_V_2_6_27_55
    1.33      bool
    1.34 -    prompt "2.6.27.54 (old long-term stable)"
    1.35 +    prompt "2.6.27.55 (old long-term stable)"
    1.36      help
    1.37        The Linux 2.6.27 tree is the previous "long-term stable" maintenance branch.
    1.38        It is intended to fill the niche for users who are not using distribution
    1.39 @@ -102,12 +102,12 @@
    1.40  # Don't remove next line
    1.41  # CT_INSERT_VERSION_STRING_BELOW
    1.42      default "2.6.36" if KERNEL_V_2_6_36
    1.43 -    default "2.6.35.7" if KERNEL_V_2_6_35_7
    1.44 +    default "2.6.35.8" if KERNEL_V_2_6_35_8
    1.45      default "2.6.34.7" if KERNEL_V_2_6_34_7
    1.46      default "2.6.33.7" if KERNEL_V_2_6_33_7
    1.47 -    default "2.6.32.24" if KERNEL_V_2_6_32_24
    1.48 +    default "2.6.32.25" if KERNEL_V_2_6_32_25
    1.49      default "2.6.31.14" if KERNEL_V_2_6_31_14
    1.50 -    default "2.6.27.54" if KERNEL_V_2_6_27_54
    1.51 +    default "2.6.27.55" if KERNEL_V_2_6_27_55
    1.52  
    1.53  choice
    1.54      bool