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

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

7 files changed, 10 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index f4fe8c6..217d775 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -1,3 +1,8 @@
+2014-03-15	Juergen Beisert <jbe@pengutronix.de
+
+	* Kernel-3.12:
+		- keep in sync with stable release .14
+
 2014-03-12	Juergen Beisert <jbe@pengutronix.de
 
 	* Kernel-3.4:
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12
index 55afb02..8c15e7d 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.13-ptx-master Kernel Configuration
+# Linux/arm 3.12.14-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.13-14.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.13-14.xz
new file mode 100644
index 0000000..43c3fc9
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.13-14.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
index 7e21d35..9e10688 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
@@ -12,6 +12,7 @@ patch-3.12.9-10.xz
 patch-3.12.10-11.xz
 patch-3.12.11-12.xz
 patch-3.12.12-13.xz
+patch-3.12.13-14.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 3ddeb65..2f01db6 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 = 13
+ SUBLEVEL = 14
 -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 046679c..6906195 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -33,7 +33,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 
 \begin{itemize}
 	\item \curKernelRev{}, stable patch level 6 (default)
-	\item 3.12, stable patch level 13
+	\item 3.12, stable patch level 14
 	\item 3.11 *), stable patch level 10
 	\item 3.10, stable patch level 33
 	\item 3.9 *), stable patch level 11
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 41d32d6..a11e9f1 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -45,7 +45,7 @@ Base System
     [x] rule file uses the release
 [x] bootloader is a release
 [ ] kernel-3.13.6 is a release
-[ ] kernel-3.12.13 is a release
+[ ] kernel-3.12.14 is a release
 [ ] kernel-3.11.10 is a release
 [ ] kernel-3.10.33 is a release
 [x] kernel-3.9.11 is a release