linux: update stable kernel to 3.1.5

Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/linux/Config.in b/linux/Config.in
index dc6aa733a52f8554656480d15d1f79bfebc8e0cb..3022b917f017b10e766444998042c8f21d275e51 100644 (file)
--- 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.4"
+       bool "3.1.5"
 
 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.4"
+       default "3.1.5"
 
 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.4" if BR2_LINUX_KERNEL_3_1
+       default "3.1.5" 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