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

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

10 files changed, 10 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 5a02432..d1d13b3 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -4,6 +4,8 @@
 		- keep in sync with stable release .63
 	* Kernel-3.4:
 		- keep in sync with stable release .104
+	* Kernel 3.12:
+		- keep in sync with stable release .28
 
 2014-07-20	Juergen Borleis <jbe@pengutronix.de
 
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.12 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.12
index 5cbd749..8b1551b 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.24-ptx-master Kernel Configuration
+# Linux/arm 3.12.28-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.24-25.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.24-25.xz
new file mode 100644
index 0000000..c4d4e2c
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.24-25.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.25-26.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.25-26.xz
new file mode 100644
index 0000000..a9d0686
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.25-26.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.26-27.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.26-27.xz
new file mode 100644
index 0000000..4432bee
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.26-27.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.27-28.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.27-28.xz
new file mode 100644
index 0000000..fe9427e
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/patch-3.12.27-28.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
index 80f3d30..7952b89 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.12/series
@@ -23,6 +23,10 @@ patch-3.12.20-21.xz
 patch-3.12.21-22.xz
 patch-3.12.22-23.xz
 patch-3.12.23-24.xz
+patch-3.12.24-25.xz
+patch-3.12.25-26.xz
+patch-3.12.26-27.xz
+patch-3.12.27-28.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 6a3997d..56b9169 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 = 24
+ SUBLEVEL = 28
 -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 6110e53..951753d 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -35,7 +35,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 	\item \curKernelRev{}, stable patch level 6 (default)
 	\item 3.14, stable patch level 13
 	\item 3.13 *), stable patch level 11
-	\item 3.12, stable patch level 24
+	\item 3.12, stable patch level 28
 	\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 918e258..14f93c0 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -47,7 +47,7 @@ Base System
 [ ] kernel-3.15.6 is a release
 [ ] kernel-3.14.13 is a release
 [ ] kernel-3.13.11 is a release
-[ ] kernel-3.12.24 is a release
+[ ] kernel-3.12.28 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