summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-29 21:24:30 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:08 +0200
commit5ffb820869c4a0b5798c18d557918748581f3ea8 (patch)
tree292c6aee0631308966c621483e7d7bd75165fd90
parent5e08d651a3bd4a5e716e2a1e654fe412e0a72a49 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-5ffb820869c4a0b5798c18d557918748581f3ea8.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-5ffb820869c4a0b5798c18d557918748581f3ea8.tar.xz
Kernel-3.9: keep in sync with stable release 3.9.4
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.92
-rw-r--r--patches/linux-3.9/patch-3.9.3-4.bz2bin0 -> 6812 bytes
-rw-r--r--patches/linux-3.9/series1
-rw-r--r--patches/linux-3.9/set-marker.diff2
6 files changed, 6 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index a32c922..a769735 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,8 @@
- keep in sync with stable release .80
* Kernel 3.4:
- keep in sync with stable release .47
+ * Kernel 3.9:
+ - keep in sync with stable release .4
2013-05-21 Juergen Beisert <jbe@pengutronix.de
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index b417dc6..522fab0 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -32,7 +32,7 @@ they are still available and also some of them are still maintained. Here is a
list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\begin{itemize}
- \item \curKernelRev{}, stable patch level 3 (default)
+ \item \curKernelRev{}, stable patch level 4 (default)
\item 3.8 *), stable patch level 13
\item 3.7 *), stable patch level 10
\item 3.6 *), stable patch level 11
diff --git a/kernelconfig-3.9 b/kernelconfig-3.9
index 6968060..dac9850 100644
--- a/kernelconfig-3.9
+++ b/kernelconfig-3.9
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.9.3-ptx-master Kernel Configuration
+# Linux/arm 3.9.4-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.9/patch-3.9.3-4.bz2 b/patches/linux-3.9/patch-3.9.3-4.bz2
new file mode 100644
index 0000000..0b5d299
--- /dev/null
+++ b/patches/linux-3.9/patch-3.9.3-4.bz2
Binary files differ
diff --git a/patches/linux-3.9/series b/patches/linux-3.9/series
index 86aeb5b..11f6e8b 100644
--- a/patches/linux-3.9/series
+++ b/patches/linux-3.9/series
@@ -2,6 +2,7 @@
patch-3.9.1.bz2
patch-3.9.1-2.bz2
patch-3.9.2-3.bz2
+patch-3.9.3-4.bz2
# add full board feature support
fix_new_display_number.diff
diff --git a/patches/linux-3.9/set-marker.diff b/patches/linux-3.9/set-marker.diff
index f7be87d..eb81379 100644
--- a/patches/linux-3.9/set-marker.diff
+++ b/patches/linux-3.9/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.9/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 9
- SUBLEVEL = 3
+ SUBLEVEL = 4
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Unicycling Gorilla