From: Peter Korsgaard Date: Thu, 31 May 2012 07:23:23 +0000 (+0200) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2;p=buildroot.git Merge branch 'next' Conflicts: toolchain/kernel-headers/Config.in --- bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 diff --cc toolchain/kernel-headers/Config.in index 12535313f5,b3fb362d01..17fe7978c4 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@@ -63,9 -64,10 +64,10 @@@ config BR2_DEFAULT_KERNEL_HEADER default "2.6.37.6" if BR2_KERNEL_HEADERS_2_6_37 default "2.6.38.8" if BR2_KERNEL_HEADERS_2_6_38 default "2.6.39.4" if BR2_KERNEL_HEADERS_2_6_39 - default "3.0.31" if BR2_KERNEL_HEADERS_3_0 + default "3.0.32" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 - default "3.2.16" if BR2_KERNEL_HEADERS_3_2 - default "3.3.5" if BR2_KERNEL_HEADERS_3_3 + default "3.2.18" if BR2_KERNEL_HEADERS_3_2 + default "3.3.7" if BR2_KERNEL_HEADERS_3_3 + default "3.4" if BR2_KERNEL_HEADERS_3_4 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION