Kernel-3.2: keep in sync with stable release .61

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

10 files changed, 13 insertions, 4 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 2aae01d..2d979e7 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -1,3 +1,8 @@
+2014-07-19	Juergen Borleis <jbe@pengutronix.de
+
+	* Kernel-3.2:
+		- keep in sync with stable release .61
+
 2014-04-30	Juergen Borleis <jbe@pengutronix.de
 
 	* Kernel-3.11, 3.12, 3.13, 3.14
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.2 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
index 840c620..0923e4a 100644
--- a/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
+++ b/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.57-ptx-master Kernel Configuration
+# Linux/arm 3.2.61-ptx-master Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.57-58.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.57-58.xz
new file mode 100644
index 0000000..c24b76b
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.57-58.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.58-59.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.58-59.xz
new file mode 100644
index 0000000..bae141b
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.58-59.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.59-60.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.59-60.xz
new file mode 100644
index 0000000..c1080ad
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.59-60.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.60-61.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.60-61.xz
new file mode 100644
index 0000000..f1a71eb
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.60-61.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
index 41650c8..f733ed2 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
@@ -56,6 +56,10 @@ patch-3.2.53-54.xz
 patch-3.2.54-55.xz
 patch-3.2.55-56.xz
 patch-3.2.56-57.xz
+patch-3.2.57-58.xz
+patch-3.2.58-59.xz
+patch-3.2.59-60.xz
+patch-3.2.60-61.xz
 
 PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
 add_lcd_w35i.diff
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff
index 548b271..45292ff 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.2/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 2
- SUBLEVEL = 57
+ SUBLEVEL = 61
 -EXTRAVERSION =
 +EXTRAVERSION = -ptx-marker
  NAME = Saber-toothed Squirrel
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index f4b7ddb..bbdf21f 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -44,7 +44,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 	\item 3.5 *), stable patch level 7
 	\item 3.4, stable patch level 88
 	\item 3.3 *), stable patch level 8
-	\item 3.2, stable patch level 57
+	\item 3.2, stable patch level 61
 	\item 3.1 *), stable patch level 10
 	\item 3.0 *), stable patch level 101
 	\item 2.6.39 *), stable patch level 4
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 31d460e..d1dcb66 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -56,7 +56,7 @@ Base System
 [x] kernel-3.5.7 is a release
 [ ] kernel-3.4.88 is a release
 [x] kernel-3.3.8 is a release
-[ ] kernel-3.2.57 is a release
+[ ] kernel-3.2.61 is a release
 [x] kernel-3.1.10 is a release
 [ ] kernel-3.0.101 is a release
 [x] kernel-2.6.39.4 is a release