summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-03-20 22:06:25 +0100
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:05 +0200
commit6f6586be121f6974b66c1f3be3ae8dec36ef0441 (patch)
tree2b0fea90f7f38d49b29b8b52fd86f52d3634109f
parent3d72ef35c2ff7ab6954f02a2b26e837cad8b48ac (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-6f6586be121f6974b66c1f3be3ae8dec36ef0441.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-6f6586be121f6974b66c1f3be3ae8dec36ef0441.tar.xz
Kernel-3.2: keep in sync with stable release 3.2.41
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog2
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--kernelconfig-3.22
-rw-r--r--patches/linux-3.2/patch-3.2.40-41.bz2bin0 -> 30047 bytes
-rw-r--r--patches/linux-3.2/series1
-rw-r--r--patches/linux-3.2/set-marker.diff2
6 files changed, 6 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 090fcdb..f8924a1 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,8 @@
* Kernel 3.0:
- keep in sync with stable release .70
+ * Kernel 3.2:
+ - keep in sync with stable release .41
2013-03-17 Juergen Beisert <jbe@pengutronix.de
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 364a4f5..ab141af 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -38,7 +38,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.5 *), stable patch level 7
\item 3.4, stable patch level 36
\item 3.3 *), stable patch level 8
- \item 3.2, stable patch level 40
+ \item 3.2, stable patch level 41
\item 3.1 *), stable patch level 10
\item 3.0, stable patch level 70
\item 2.6.39 *), stable patch level 4
diff --git a/kernelconfig-3.2 b/kernelconfig-3.2
index 33d1536..d0ca1b7 100644
--- a/kernelconfig-3.2
+++ b/kernelconfig-3.2
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.2.40-ptx-master Kernel Configuration
+# Linux/arm 3.2.41-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.2/patch-3.2.40-41.bz2 b/patches/linux-3.2/patch-3.2.40-41.bz2
new file mode 100644
index 0000000..30cf3d0
--- /dev/null
+++ b/patches/linux-3.2/patch-3.2.40-41.bz2
Binary files differ
diff --git a/patches/linux-3.2/series b/patches/linux-3.2/series
index 59baa08..b23c9c3 100644
--- a/patches/linux-3.2/series
+++ b/patches/linux-3.2/series
@@ -39,6 +39,7 @@ patch-3.2.36-37.bz2
patch-3.2.37-38.bz2
patch-3.2.38-39.bz2
patch-3.2.39-40.bz2
+patch-3.2.40-41.bz2
PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
add_lcd_w35i.diff
diff --git a/patches/linux-3.2/set-marker.diff b/patches/linux-3.2/set-marker.diff
index b42af65..eec0b64 100644
--- a/patches/linux-3.2/set-marker.diff
+++ b/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 = 40
+ SUBLEVEL = 41
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel