summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-21 22:05:03 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:08 +0200
commitd7ed8119855fe4e7ef4c0a3bd5344ee5acdabb70 (patch)
treec08863dba644fcb50ac94553908e2235bc5885ad
parent32ac8e245e5876ded7d4df6cf323de92aa9f0247 (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-d7ed8119855fe4e7ef4c0a3bd5344ee5acdabb70.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-d7ed8119855fe4e7ef4c0a3bd5344ee5acdabb70.tar.xz
Kernel-3.9: keep in sync with stable release 3.9.3
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.93
-rw-r--r--patches/linux-3.9/patch-3.9.2-3.bz2bin0 -> 33089 bytes
-rw-r--r--patches/linux-3.9/series1
-rw-r--r--patches/linux-3.9/set-marker.diff2
6 files changed, 6 insertions, 4 deletions
diff --git a/Changelog b/Changelog
index 32c32e8..3b1f03e 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,8 @@
- keep in sync with stable release .79
* Kernel 3.4:
- keep in sync with stable release .46
+ * Kernel 3.9:
+ - keep in sync with stable release .3
2013-05-14 Juergen Beisert <jbe@pengutronix.de
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 8c5c4f9..870e1cb 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 2 (default)
+ \item \curKernelRev{}, stable patch level 3 (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 27501eb..6968060 100644
--- a/kernelconfig-3.9
+++ b/kernelconfig-3.9
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.9.2-ptx-master Kernel Configuration
+# Linux/arm 3.9.3-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
@@ -64,7 +64,6 @@ CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_GENERIC_IRQ_CHIP=y
CONFIG_IRQ_DOMAIN=y
# CONFIG_IRQ_DOMAIN_DEBUG is not set
-# CONFIG_ALWAYS_USE_PERSISTENT_CLOCK is not set
CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_USES_GETTIMEOFFSET=y
diff --git a/patches/linux-3.9/patch-3.9.2-3.bz2 b/patches/linux-3.9/patch-3.9.2-3.bz2
new file mode 100644
index 0000000..dc202c0
--- /dev/null
+++ b/patches/linux-3.9/patch-3.9.2-3.bz2
Binary files differ
diff --git a/patches/linux-3.9/series b/patches/linux-3.9/series
index 7d366fc..86aeb5b 100644
--- a/patches/linux-3.9/series
+++ b/patches/linux-3.9/series
@@ -1,6 +1,7 @@
# keep in sync with stable
patch-3.9.1.bz2
patch-3.9.1-2.bz2
+patch-3.9.2-3.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 492955d..f7be87d 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 = 2
+ SUBLEVEL = 3
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Unicycling Gorilla