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

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

8 files changed, 8 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 2b1cf91..f2c9526 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -8,6 +8,8 @@
 		- keep in sync with stable release .37
 	* Kernel 3.11:
 		- mark this kernel as broken on the Mini2440
+	* Kernel 3.12:
+		- keep in sync with stable release .17
 
 2014-04-04	Juergen Beisert <jbe@pengutronix.de
 
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12
index 7633e3a..e961ec3 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.16-ptx-master Kernel Configuration
+# Linux/arm 3.12.18-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.16-17.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.16-17.xz
new file mode 100644
index 0000000..df62df2
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.16-17.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.17-18.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.17-18.xz
new file mode 100644
index 0000000..2c0dade
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.17-18.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
index 43d6568..18928bf 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
@@ -15,6 +15,8 @@ patch-3.12.12-13.xz
 patch-3.12.13-14.xz
 patch-3.12.14-15.xz
 patch-3.12.15-16.xz
+patch-3.12.16-17.xz
+patch-3.12.17-18.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 a66e7e4..5b56663 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 = 16
+ SUBLEVEL = 18
 -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 46cd07c..6a0b034 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 0 (default)
 	\item 3.13, stable patch level 9
-	\item 3.12, stable patch level 16
+	\item 3.12, stable patch level 18
 	\item 3.11 *), stable patch level 10 **)
 	\item 3.10, stable patch level 37
 	\item 3.9 *), stable patch level 11
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 52ce2c7..0616ca7 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.0 is a release
 [ ] kernel-3.13.9 is a release
-[ ] kernel-3.12.16 is a release
+[ ] kernel-3.12.18 is a release
 [ ] kernel-3.11.10 is a release
 [ ] kernel-3.10.37 is a release
 [x] kernel-3.9.11 is a release