Kernel-3.12: keep in sync with stable release .24

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>

12 files changed, 12 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 821b4f9..c59e164 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -6,6 +6,8 @@
 		- keep in sync with stable release .99
 	* Kernel 3.10:
 		- mark this kernel as broken on the Mini2440
+	* Kernel 3.12:
+		- keep in sync with stable release .24
 
 2014-04-30	Juergen Borleis <jbe@pengutronix.de
 
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12
index f568a9c..5cbd749 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.12.18-ptx-master Kernel Configuration
+# Linux/arm 3.12.24-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.18-19.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.18-19.xz
new file mode 100644
index 0000000..0fdd2f6
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.18-19.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.19-20.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.19-20.xz
new file mode 100644
index 0000000..cf29b34
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.19-20.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.20-21.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.20-21.xz
new file mode 100644
index 0000000..bf6cdef
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.20-21.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.21-22.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.21-22.xz
new file mode 100644
index 0000000..4dd3039
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.21-22.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.22-23.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.22-23.xz
new file mode 100644
index 0000000..55041b1
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.22-23.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.23-24.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.23-24.xz
new file mode 100644
index 0000000..d510a58
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.23-24.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
index 18928bf..80f3d30 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
@@ -17,6 +17,12 @@ patch-3.12.14-15.xz
 patch-3.12.15-16.xz
 patch-3.12.16-17.xz
 patch-3.12.17-18.xz
+patch-3.12.18-19.xz
+patch-3.12.19-20.xz
+patch-3.12.20-21.xz
+patch-3.12.21-22.xz
+patch-3.12.22-23.xz
+patch-3.12.23-24.xz
 
 # add full board feature support
 fix_new_display_number.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff
index 5b56663..6a3997d 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.12/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 12
- SUBLEVEL = 18
+ SUBLEVEL = 24
 -EXTRAVERSION =
 +EXTRAVERSION = -ptx-master
  NAME = One Giant Leap for Frogkind
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 32e8c16..cb62aa3 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -34,7 +34,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 \begin{itemize}
 	\item \curKernelRev{}, stable patch level 2 (default)
 	\item 3.13 *), stable patch level 11
-	\item 3.12, stable patch level 18
+	\item 3.12, stable patch level 24
 	\item 3.11 *), stable patch level 10 **)
 	\item 3.10, stable patch level 38 **)
 	\item 3.9 *), stable patch level 11
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index fc42236..00d1f7e 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -46,7 +46,7 @@ Base System
 [x] bootloader is a release
 [ ] kernel-3.14.2 is a release
 [ ] kernel-3.13.11 is a release
-[ ] kernel-3.12.18 is a release
+[ ] kernel-3.12.24 is a release
 [ ] kernel-3.11.10 is a release
 [ ] kernel-3.10.38 is a release
 [x] kernel-3.9.11 is a release