summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-04-17 19:59:19 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:06 +0200
commitc3ac09594f82a980f55a4dae2fa96a022950c73a (patch)
tree2155459322c5d258d85762fe18039aa1ceea2982
parent1de85c1e8f42b27c03b4e3fa93b12f6b82eeca62 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-c3ac09594f82a980f55a4dae2fa96a022950c73a.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-c3ac09594f82a980f55a4dae2fa96a022950c73a.tar.xz
Kernel-3.4: keep in sync with stable release 3.4.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.42
-rw-r--r--patches/linux-3.4/patch-3.4.40-41.bz2bin0 -> 6334 bytes
-rw-r--r--patches/linux-3.4/series1
-rw-r--r--patches/linux-3.4/set-marker.diff2
6 files changed, 6 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index 2749bd3..25352f6 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,8 @@
* Kernel 3.0:
- keep in sync with stable release .74
+ * Kernel 3.4:
+ - keep in sync with stable release .41
2013-04-14 Juergen Beisert <jbe@pengutronix.de
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 91ca0ad..0afc4b1 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -36,7 +36,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 40
+ \item 3.4, stable patch level 41
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 43
\item 3.1 *), stable patch level 10
diff --git a/kernelconfig-3.4 b/kernelconfig-3.4
index dbadb06..ba532f8 100644
--- a/kernelconfig-3.4
+++ b/kernelconfig-3.4
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.40-ptx-master Kernel Configuration
+# Linux/arm 3.4.41-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.4/patch-3.4.40-41.bz2 b/patches/linux-3.4/patch-3.4.40-41.bz2
new file mode 100644
index 0000000..047ebf6
--- /dev/null
+++ b/patches/linux-3.4/patch-3.4.40-41.bz2
Binary files differ
diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series
index 3d9ae8a..37d4dcf 100644
--- a/patches/linux-3.4/series
+++ b/patches/linux-3.4/series
@@ -39,6 +39,7 @@ patch-3.4.36-37.bz2
patch-3.4.37-38.bz2
patch-3.4.38-39.bz2
patch-3.4.39-40.bz2
+patch-3.4.40-41.bz2
fix_new_display_number.diff
PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
diff --git a/patches/linux-3.4/set-marker.diff b/patches/linux-3.4/set-marker.diff
index 6de4eb1..bd41431 100644
--- a/patches/linux-3.4/set-marker.diff
+++ b/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 = 40
+ SUBLEVEL = 41
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel