summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.in4
-rw-r--r--mk/kernel-ver.mk6
-rw-r--r--target/linux/patches/3.1.5/bsd-compatibility.patch (renamed from target/linux/patches/3.1.4/bsd-compatibility.patch)0
-rw-r--r--target/linux/patches/3.1.5/cris-etrax.patch (renamed from target/linux/patches/3.1.4/cris-etrax.patch)0
-rw-r--r--target/linux/patches/3.1.5/defaults.patch (renamed from target/linux/patches/3.1.4/defaults.patch)0
-rw-r--r--target/linux/patches/3.1.5/fon2100.patch (renamed from target/linux/patches/3.1.4/fon2100.patch)0
-rw-r--r--target/linux/patches/3.1.5/gemalto.patch (renamed from target/linux/patches/3.1.4/gemalto.patch)0
-rw-r--r--target/linux/patches/3.1.5/mmc-host.patch (renamed from target/linux/patches/3.1.4/mmc-host.patch)0
-rw-r--r--target/linux/patches/3.1.5/non-static.patch (renamed from target/linux/patches/3.1.4/non-static.patch)0
-rw-r--r--target/linux/patches/3.1.5/sparc-include.patch (renamed from target/linux/patches/3.1.4/sparc-include.patch)0
-rw-r--r--target/linux/patches/3.1.5/startup.patch (renamed from target/linux/patches/3.1.4/startup.patch)0
-rw-r--r--target/linux/patches/3.1.5/usb-defaults-off.patch (renamed from target/linux/patches/3.1.4/usb-defaults-off.patch)0
-rw-r--r--target/linux/patches/3.1.5/uuid.patch (renamed from target/linux/patches/3.1.4/uuid.patch)0
-rw-r--r--target/linux/patches/3.1.5/vga-cons-default-off.patch (renamed from target/linux/patches/3.1.4/vga-cons-default-off.patch)0
-rw-r--r--target/linux/patches/3.1.5/wlan-cf.patch (renamed from target/linux/patches/3.1.4/wlan-cf.patch)0
-rw-r--r--target/linux/patches/3.1.5/x86-build.patch (renamed from target/linux/patches/3.1.4/x86-build.patch)0
-rw-r--r--target/linux/patches/3.1.5/zlib-inflate.patch (renamed from target/linux/patches/3.1.4/zlib-inflate.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.1.5/aufs2.patch (renamed from toolchain/kernel-headers/patches/3.1.4/aufs2.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.1.5/cleankernel.patch (renamed from toolchain/kernel-headers/patches/3.1.4/cleankernel.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.1.5/etrax-header.patch (renamed from toolchain/kernel-headers/patches/3.1.4/etrax-header.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.1.5/linux-gcc-check.patch (renamed from toolchain/kernel-headers/patches/3.1.4/linux-gcc-check.patch)0
-rw-r--r--toolchain/kernel-headers/patches/3.1.5/microperl.patch (renamed from toolchain/kernel-headers/patches/3.1.4/microperl.patch)0
22 files changed, 5 insertions, 5 deletions
diff --git a/Config.in b/Config.in
index 5d859416b..4358b3a7a 100644
--- a/Config.in
+++ b/Config.in
@@ -84,8 +84,8 @@ config ADK_KERNEL_VERSION_3_0_9
prompt "3.0.9"
boolean
-config ADK_KERNEL_VERSION_3_1_4
- prompt "3.1.4"
+config ADK_KERNEL_VERSION_3_1_5
+ prompt "3.1.5"
boolean
endchoice
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index aac5c7180..ff1fc0cc4 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -8,8 +8,8 @@ KERNEL_VERSION:= 3.0.9
KERNEL_RELEASE:= 1
KERNEL_MD5SUM:= 71992fa4dfc289a959f9ce266d08d77b
endif
-ifeq ($(ADK_KERNEL_VERSION_3_1_4),y)
-KERNEL_VERSION:= 3.1.4
+ifeq ($(ADK_KERNEL_VERSION_3_1_5),y)
+KERNEL_VERSION:= 3.1.5
KERNEL_RELEASE:= 1
-KERNEL_MD5SUM:= 52643e5a013d450ad69627c3cac490cb
+KERNEL_MD5SUM:= 20cc2ecedbd996c223db61f249afbe3e
endif
diff --git a/target/linux/patches/3.1.4/bsd-compatibility.patch b/target/linux/patches/3.1.5/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.1.4/bsd-compatibility.patch
+++ b/target/linux/patches/3.1.5/bsd-compatibility.patch
diff --git a/target/linux/patches/3.1.4/cris-etrax.patch b/target/linux/patches/3.1.5/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.1.4/cris-etrax.patch
+++ b/target/linux/patches/3.1.5/cris-etrax.patch
diff --git a/target/linux/patches/3.1.4/defaults.patch b/target/linux/patches/3.1.5/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.1.4/defaults.patch
+++ b/target/linux/patches/3.1.5/defaults.patch
diff --git a/target/linux/patches/3.1.4/fon2100.patch b/target/linux/patches/3.1.5/fon2100.patch
index 038ff7020..038ff7020 100644
--- a/target/linux/patches/3.1.4/fon2100.patch
+++ b/target/linux/patches/3.1.5/fon2100.patch
diff --git a/target/linux/patches/3.1.4/gemalto.patch b/target/linux/patches/3.1.5/gemalto.patch
index f3c223b5e..f3c223b5e 100644
--- a/target/linux/patches/3.1.4/gemalto.patch
+++ b/target/linux/patches/3.1.5/gemalto.patch
diff --git a/target/linux/patches/3.1.4/mmc-host.patch b/target/linux/patches/3.1.5/mmc-host.patch
index 3d0e37add..3d0e37add 100644
--- a/target/linux/patches/3.1.4/mmc-host.patch
+++ b/target/linux/patches/3.1.5/mmc-host.patch
diff --git a/target/linux/patches/3.1.4/non-static.patch b/target/linux/patches/3.1.5/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.1.4/non-static.patch
+++ b/target/linux/patches/3.1.5/non-static.patch
diff --git a/target/linux/patches/3.1.4/sparc-include.patch b/target/linux/patches/3.1.5/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.1.4/sparc-include.patch
+++ b/target/linux/patches/3.1.5/sparc-include.patch
diff --git a/target/linux/patches/3.1.4/startup.patch b/target/linux/patches/3.1.5/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.1.4/startup.patch
+++ b/target/linux/patches/3.1.5/startup.patch
diff --git a/target/linux/patches/3.1.4/usb-defaults-off.patch b/target/linux/patches/3.1.5/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.1.4/usb-defaults-off.patch
+++ b/target/linux/patches/3.1.5/usb-defaults-off.patch
diff --git a/target/linux/patches/3.1.4/uuid.patch b/target/linux/patches/3.1.5/uuid.patch
index 2529fdab5..2529fdab5 100644
--- a/target/linux/patches/3.1.4/uuid.patch
+++ b/target/linux/patches/3.1.5/uuid.patch
diff --git a/target/linux/patches/3.1.4/vga-cons-default-off.patch b/target/linux/patches/3.1.5/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.1.4/vga-cons-default-off.patch
+++ b/target/linux/patches/3.1.5/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.1.4/wlan-cf.patch b/target/linux/patches/3.1.5/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.1.4/wlan-cf.patch
+++ b/target/linux/patches/3.1.5/wlan-cf.patch
diff --git a/target/linux/patches/3.1.4/x86-build.patch b/target/linux/patches/3.1.5/x86-build.patch
index 339140f41..339140f41 100644
--- a/target/linux/patches/3.1.4/x86-build.patch
+++ b/target/linux/patches/3.1.5/x86-build.patch
diff --git a/target/linux/patches/3.1.4/zlib-inflate.patch b/target/linux/patches/3.1.5/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.1.4/zlib-inflate.patch
+++ b/target/linux/patches/3.1.5/zlib-inflate.patch
diff --git a/toolchain/kernel-headers/patches/3.1.4/aufs2.patch b/toolchain/kernel-headers/patches/3.1.5/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.1.4/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.1.5/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.1.4/cleankernel.patch b/toolchain/kernel-headers/patches/3.1.5/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.1.4/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.1.5/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.1.4/etrax-header.patch b/toolchain/kernel-headers/patches/3.1.5/etrax-header.patch
index 0c644ce25..0c644ce25 100644
--- a/toolchain/kernel-headers/patches/3.1.4/etrax-header.patch
+++ b/toolchain/kernel-headers/patches/3.1.5/etrax-header.patch
diff --git a/toolchain/kernel-headers/patches/3.1.4/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.1.5/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.1.4/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.1.5/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.1.4/microperl.patch b/toolchain/kernel-headers/patches/3.1.5/microperl.patch
index 2955b7421..2955b7421 100644
--- a/toolchain/kernel-headers/patches/3.1.4/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.1.5/microperl.patch