summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-03-20 22:09:28 +0100
committerJuergen Beisert <jbe@pengutronix.de>2013-03-20 22:10:44 +0100
commit359572abc35056a0d94978d0aba130e8fb8ee0d5 (patch)
treef62c0c1f04c11d01414d88186c4dff335899bfc2
parent35f5d0ded30bd6debf59c6e50ba3434e7c7ea6b4 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-359572abc35056a0d94978d0aba130e8fb8ee0d5.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-359572abc35056a0d94978d0aba130e8fb8ee0d5.tar.xz
Kernel-3.4: keep in sync with stable release 3.4.37
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.36-37.bz2bin0 -> 13259 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 f8924a1..3f39f2a 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,8 @@
- keep in sync with stable release .70
* Kernel 3.2:
- keep in sync with stable release .41
+ * Kernel 3.4:
+ - keep in sync with stable release .37
2013-03-17 Juergen Beisert <jbe@pengutronix.de
diff --git a/kernelconfig-3.4 b/kernelconfig-3.4
index 76ddb82..ca92b14 100644
--- a/kernelconfig-3.4
+++ b/kernelconfig-3.4
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.36-ptx-master Kernel Configuration
+# Linux/arm 3.4.37-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.4/patch-3.4.36-37.bz2 b/patches/linux-3.4/patch-3.4.36-37.bz2
new file mode 100644
index 0000000..d25cb30
--- /dev/null
+++ b/patches/linux-3.4/patch-3.4.36-37.bz2
Binary files differ
diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series
index b4ff070..547c1f0 100644
--- a/patches/linux-3.4/series
+++ b/patches/linux-3.4/series
@@ -35,6 +35,7 @@ patch-3.4.32-33.bz2
patch-3.4.33-34.bz2
patch-3.4.34-35.bz2
patch-3.4.35-36.bz2
+patch-3.4.36-37.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 820c444..3b4716a 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 = 36
+ SUBLEVEL = 37
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel
diff --git a/plain_sources/special_notes.tex b/plain_sources/special_notes.tex
index ab141af..d4ed8aa 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 36
+ \item 3.4, stable patch level 37
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 41
\item 3.1 *), stable patch level 10