summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-06 22:06:32 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-05-06 22:06:32 +0200
commitb0eb35d1fb0da9f5520053b346ae0f3aab378b81 (patch)
treef45b9cc703f43366e59856b924a326b5265af179
parentdfbce89b2c28a0a2f6a197ba07244f25e7516cf0 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-b0eb35d1fb0da9f5520053b346ae0f3aab378b81.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-b0eb35d1fb0da9f5520053b346ae0f3aab378b81.tar.xz
Kernel-3.4: keep in sync with stable release 3.4.43
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.42-43.bz2bin0 -> 11799 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 c78dd21..8a53182 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,8 @@
* Kernel 3.0:
- keep in sync with stable release .76
+ * Kernel 3.4:
+ - keep in sync with stable release .43
2013-04-29 Juergen Beisert <jbe@pengutronix.de
diff --git a/kernelconfig-3.4 b/kernelconfig-3.4
index 411f11b..77a1531 100644
--- a/kernelconfig-3.4
+++ b/kernelconfig-3.4
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.42-ptx-master Kernel Configuration
+# Linux/arm 3.4.43-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.4/patch-3.4.42-43.bz2 b/patches/linux-3.4/patch-3.4.42-43.bz2
new file mode 100644
index 0000000..97d9b0e
--- /dev/null
+++ b/patches/linux-3.4/patch-3.4.42-43.bz2
Binary files differ
diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series
index 4d42b49..ab0ee88 100644
--- a/patches/linux-3.4/series
+++ b/patches/linux-3.4/series
@@ -41,6 +41,7 @@ patch-3.4.38-39.bz2
patch-3.4.39-40.bz2
patch-3.4.40-41.bz2
patch-3.4.41-42.bz2
+patch-3.4.42-43.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 aa544a1..798f055 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 = 42
+ SUBLEVEL = 43
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel
diff --git a/plain_sources/special_notes.tex b/plain_sources/special_notes.tex
index 8e70be4..8a440a0 100644
--- a/plain_sources/special_notes.tex
+++ b/plain_sources/special_notes.tex
@@ -37,7 +37,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 42
+ \item 3.4, stable patch level 43
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 44
\item 3.1 *), stable patch level 10