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

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

8 files changed, 12 insertions, 5 deletions

diff --git a/configs/platform-friendlyarm-mini2440/Changelog b/configs/platform-friendlyarm-mini2440/Changelog
index 4f49de0..37737cb 100644
--- a/configs/platform-friendlyarm-mini2440/Changelog
+++ b/configs/platform-friendlyarm-mini2440/Changelog
@@ -1,3 +1,8 @@
+2015-01-21	Juergen Borleis <jbe@pengutronix.de
+
+	* Kernel-3.2:
+		- keep in sync with stable release .65
+
 2014-11-02	Juergen Borleis <jbe@pengutronix.de
 
 	* Kernel 3.12:
diff --git a/configs/platform-friendlyarm-mini2440/kernelconfig-3.2 b/configs/platform-friendlyarm-mini2440/kernelconfig-3.2
index bb19453..e62f51f 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.63-ptx-master Kernel Configuration
+# Linux/arm 3.2.65-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.63-64.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.63-64.xz
new file mode 100644
index 0000000..5b8fd33
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.63-64.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.64-65.xz b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.64-65.xz
new file mode 100644
index 0000000..d2318c8
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/patch-3.2.64-65.xz
diff --git a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
index 386bd6a..391a620 100644
--- a/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
+++ b/configs/platform-friendlyarm-mini2440/patches/linux-3.2/series
@@ -62,6 +62,8 @@ patch-3.2.59-60.xz
 patch-3.2.60-61.xz
 patch-3.2.61-62.xz
 patch-3.2.62-63.xz
+patch-3.2.63-64.xz
+patch-3.2.64-65.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 2a9248c..e407c97 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,9 +9,9 @@ Index: linux-3.2/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 2
- SUBLEVEL = 63
+ SUBLEVEL = 65
 -EXTRAVERSION =
-+EXTRAVERSION = -ptx-marker
++EXTRAVERSION = -ptx-master
  NAME = Saber-toothed Squirrel
  
  # *DOCUMENTATION*
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 1303f41..407dedf 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -47,7 +47,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
 	\item 3.5 *), stable patch level 7
 	\item 3.4, stable patch level 104
 	\item 3.3 *), stable patch level 8
-	\item 3.2, stable patch level 63
+	\item 3.2, stable patch level 65
 	\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 1840ecd..dfb1f52 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -58,7 +58,7 @@ Base System
 [x] kernel-3.5.7 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
+[ ] kernel-3.2.65 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