Kernel-3.4: keep in sync with stable release .104

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

11 files changed, 11 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index e65dd1f..5a02432 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -2,6 +2,8 @@
 
 	* Kernel-3.2:
 		- keep in sync with stable release .63
+	* Kernel-3.4:
+		- keep in sync with stable release .104
 
 2014-07-20	Juergen Borleis <jbe@pengutronix.de
 
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.4 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.4
index c2f7c36..b1915bd 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.4
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.4
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.99-ptx-master Kernel Configuration
+# Linux/arm 3.4.104-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.100-101.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.100-101.xz
new file mode 100644
index 0000000..0559c34
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.100-101.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.101-102.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.101-102.xz
new file mode 100644
index 0000000..817660a
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.101-102.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.102-103.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.102-103.xz
new file mode 100644
index 0000000..f2f300c
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.102-103.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.103-104.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.103-104.xz
new file mode 100644
index 0000000..c145a91
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.103-104.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.99-100.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.99-100.xz
new file mode 100644
index 0000000..07d7b7f
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/patch-3.4.99-100.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series
index 4c2635c..6d04d0d 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/series
@@ -98,6 +98,11 @@ patch-3.4.95-96.xz
 patch-3.4.96-97.xz
 patch-3.4.97-98.xz
 patch-3.4.98-99.xz
+patch-3.4.99-100.xz
+patch-3.4.100-101.xz
+patch-3.4.101-102.xz
+patch-3.4.102-103.xz
+patch-3.4.103-104.xz
 
 fix_new_display_number.diff
 PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff
index 7d950fa..2ea3eb4 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.4/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.4/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 4
- SUBLEVEL = 99
+ SUBLEVEL = 104
 -EXTRAVERSION =
 +EXTRAVERSION = -ptx-master
  NAME = Saber-toothed Squirrel
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index f81100a..6110e53 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -43,7 +43,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 	\item 3.7 *), stable patch level 10
 	\item 3.6 *), stable patch level 11
 	\item 3.5 *), stable patch level 7
-	\item 3.4, stable patch level 99
+	\item 3.4, stable patch level 104
 	\item 3.3 *), stable patch level 8
 	\item 3.2, stable patch level 63
 	\item 3.1 *), stable patch level 10
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index a1acabb..918e258 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -55,7 +55,7 @@ Base System
 [x] kernel-3.7.10 is a release
 [x] kernel-3.6.11 is a release
 [x] kernel-3.5.7 is a release
-[ ] kernel-3.4.99 is a release
+[ ] kernel-3.4.104 is a release
 [x] kernel-3.3.8 is a release
 [ ] kernel-3.2.63 is a release
 [x] kernel-3.1.10 is a release