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

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

9 files changed, 12 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 3c70a42..6f412d9 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -1,3 +1,8 @@
+2014-11-02	Juergen Borleis <jbe@pengutronix.de
+
+	* Kernel 3.12:
+		- keep in sync with stable release .31
+
 2014-09-29	Juergen Borleis <jbe@pengutronix.de
 
 	* Kernel-3.2:
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12
index 8b1551b..96c35b6 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.28-ptx-master Kernel Configuration
+# Linux/arm 3.12.31-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.28-29.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.28-29.xz
new file mode 100644
index 0000000..537dff2
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.28-29.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.29-30.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.29-30.xz
new file mode 100644
index 0000000..49e40fd
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.29-30.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.30-31.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.30-31.xz
new file mode 100644
index 0000000..1af5aee
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.30-31.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
index 7952b89..3cce37f 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
@@ -27,6 +27,9 @@ patch-3.12.24-25.xz
 patch-3.12.25-26.xz
 patch-3.12.26-27.xz
 patch-3.12.27-28.xz
+patch-3.12.28-29.xz
+patch-3.12.29-30.xz
+patch-3.12.30-31.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 56b9169..3cf4ac1 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 = 28
+ SUBLEVEL = 31
 -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 a16b849..4eee8f7 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -37,7 +37,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 	\item 3.15, stable patch level 7
 	\item 3.14, stable patch level 19
 	\item 3.13 *), stable patch level 11
-	\item 3.12, stable patch level 28
+	\item 3.12, stable patch level 31
 	\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 b6306b0..3baf553 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -48,7 +48,7 @@ Base System
 [ ] kernel-3.15.7 is a release
 [ ] kernel-3.14.19 is a release
 [ ] kernel-3.13.11 is a release
-[ ] kernel-3.12.28 is a release
+[ ] kernel-3.12.31 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