summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-13 21:24:54 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:07 +0200
commit073ae9495f9e30d05f0f8b0dcac5bee5bece80ca (patch)
treeaa92f1aeb19693c50d6cf8052cd11cb36ec4868e
parent0463f99a3655e1f310480aa00af9db259deb975f (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-073ae9495f9e30d05f0f8b0dcac5bee5bece80ca.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-073ae9495f9e30d05f0f8b0dcac5bee5bece80ca.tar.xz
Kernel-3.4: keep in sync with stable release 3.4.45
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.44-45.bz2bin0 -> 10153 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 77d39dc..c5d0aab 100644
--- a/Changelog
+++ b/Changelog
@@ -2,6 +2,8 @@
* Kernel 3.0:
- keep in sync with stable release .78
+ * Kernel 3.4:
+ - keep in sync with stable release .45
2013-05-08 Juergen Beisert <jbe@pengutronix.de
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 58555e0..6028dfe 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/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 44
+ \item 3.4, stable patch level 45
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 44
\item 3.1 *), stable patch level 10
diff --git a/kernelconfig-3.4 b/kernelconfig-3.4
index 81b2733..253e9d0 100644
--- a/kernelconfig-3.4
+++ b/kernelconfig-3.4
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.44-ptx-master Kernel Configuration
+# Linux/arm 3.4.45-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.4/patch-3.4.44-45.bz2 b/patches/linux-3.4/patch-3.4.44-45.bz2
new file mode 100644
index 0000000..d3cffe9
--- /dev/null
+++ b/patches/linux-3.4/patch-3.4.44-45.bz2
Binary files differ
diff --git a/patches/linux-3.4/series b/patches/linux-3.4/series
index c984e4f..453624a 100644
--- a/patches/linux-3.4/series
+++ b/patches/linux-3.4/series
@@ -43,6 +43,7 @@ patch-3.4.40-41.bz2
patch-3.4.41-42.bz2
patch-3.4.42-43.bz2
patch-3.4.43-44.bz2
+patch-3.4.44-45.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 2089640..10bc8a5 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 = 44
+ SUBLEVEL = 45
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Saber-toothed Squirrel