summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-04-14 21:48:18 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-04-14 21:48:18 +0200
commit3bebd308a7647657804a84e4f0e362940f560662 (patch)
tree61f05a17920422947190a808f188952fbbfdf099
parent583700ec2c79dd44ecbfdeae5b3861d7c6dc73bb (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-3bebd308a7647657804a84e4f0e362940f560662.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-3bebd308a7647657804a84e4f0e362940f560662.tar.xz
Kernel-3.4: keep in sync with stable release 3.4.40
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog2
-rw-r--r--kernelconfig-3.42
-rw-r--r--patches/linux-3.4/patch-3.4.39-40.bz2bin0 -> 8931 bytes
-rw-r--r--patches/linux-3.4/series1
-rw-r--r--patches/linux-3.4/set-marker.diff2
-rw-r--r--plain_sources/special_notes.tex2
6 files changed, 6 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index e44ecc7..06a25a4 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,8 @@
- keep in sync with stable release .73
* Kernel 3.2:
- keep in sync with stable release .43
+ * Kernel 3.4:
+ - keep in sync with stable release .40
2013-04-08 Juergen Beisert <jbe@pengutronix.de
diff --git a/kernelconfig-3.4 b/kernelconfig-3.4
index 0a4dfbe..dbadb06 100644
--- a/kernelconfig-3.4
+++ b/kernelconfig-3.4
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.39-ptx-master Kernel Configuration
+# Linux/arm 3.4.40-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.4/patch-3.4.39-40.bz2 b/patches/linux-3.4/patch-3.4.39-40.bz2
new file mode 100644
index 0000000..37297f1
--- /dev/null
+++ b/patches/linux-3.4/patch-3.4.39-40.bz2
Binary files differ
diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series
index fd4f9db..3d9ae8a 100644
--- a/patches/linux-3.4/series
+++ b/patches/linux-3.4/series
@@ -38,6 +38,7 @@ patch-3.4.35-36.bz2
patch-3.4.36-37.bz2
patch-3.4.37-38.bz2
patch-3.4.38-39.bz2
+patch-3.4.39-40.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 bb02635..6de4eb1 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 = 39
+ SUBLEVEL = 40
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel
diff --git a/plain_sources/special_notes.tex b/plain_sources/special_notes.tex
index 55731f4..74361a3 100644
--- a/plain_sources/special_notes.tex
+++ b/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 39
+ \item 3.4, stable patch level 40
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 43
\item 3.1 *), stable patch level 10