summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2011-11-21 23:14:47 -0300
committerPeter Korsgaard <jacmet@sunsite.dk>2011-11-22 10:15:44 +0100
commit9fec836b7e477ec64aae4f02c593311792f3c88d (patch)
treea8c281203652e606aa793008b80e279bc9554535 /linux
parent66bdd2a27b5fca501365c7f0d25691bb842e3270 (diff)
linux: update stable kernel to 3.1.2
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'linux')
-rw-r--r--linux/Config.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/Config.in b/linux/Config.in
index c304d869c..591ab3d41 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -22,7 +22,7 @@ choice
default BR2_LINUX_KERNEL_3_1
config BR2_LINUX_KERNEL_3_1
- bool "3.1.1"
+ bool "3.1.2"
config BR2_LINUX_KERNEL_SAME_AS_HEADERS
bool "Same as toolchain kernel headers"
@@ -58,7 +58,7 @@ endchoice
config BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE
string "Kernel version"
depends on BR2_LINUX_KERNEL_CUSTOM_VERSION
- default "3.1.1"
+ default "3.1.2"
config BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION
string "URL of custom kernel tarball"
@@ -74,7 +74,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION
config BR2_LINUX_KERNEL_VERSION
string
- default "3.1.1" if BR2_LINUX_KERNEL_3_1
+ default "3.1.2" if BR2_LINUX_KERNEL_3_1
default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL