summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorSven Neumann <s.neumann@raumfeld.com>2012-01-02 17:43:20 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2012-01-02 19:55:28 +0100
commitcca999969535bb59ae8c87404beccb4adb795580 (patch)
treef6bc4ebaf2c6d27fd56db6e1ab501644d01398b3 /linux
parenta1c3efb52cd8a2fd98a95aed638ec3f822a73e6b (diff)
linux: update stable kernel to 3.1.6
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com> 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 3022b917f..892a50312 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.5"
+ bool "3.1.6"
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.5"
+ default "3.1.6"
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.5" if BR2_LINUX_KERNEL_3_1
+ default "3.1.6" 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