summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-05-13 21:27:26 +0200
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:08 +0200
commit6bc53dcb9ee2fcb9b96f80a38297086d6312e473 (patch)
treeaa6850ef1f1169adf0427301a6a12b79a8f65203
parent4a86b145212226d488114556228e71af558e20aa (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-6bc53dcb9ee2fcb9b96f80a38297086d6312e473.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-6bc53dcb9ee2fcb9b96f80a38297086d6312e473.tar.xz
Kernel-3.9: keep in sync with stable release 3.9.2
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.1-2.bz2bin0 -> 25205 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 dd32286..3531e29 100644
--- a/Changelog
+++ b/Changelog
@@ -6,6 +6,8 @@
- keep in sync with stable release .45
* Kernel 3.8:
- keep in sync with stable release .13
+ * Kernel 3.9:
+ - keep in sync with stable release .2
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 1b329c6..952fc85 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 1(default)
+ \item \curKernelRev{}, stable patch level 2 (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 87f9383..27501eb 100644
--- a/kernelconfig-3.9
+++ b/kernelconfig-3.9
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.9.1-ptx-master Kernel Configuration
+# Linux/arm 3.9.2-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.9/patch-3.9.1-2.bz2 b/patches/linux-3.9/patch-3.9.1-2.bz2
new file mode 100644
index 0000000..ba04888
--- /dev/null
+++ b/patches/linux-3.9/patch-3.9.1-2.bz2
Binary files differ
diff --git a/patches/linux-3.9/series b/patches/linux-3.9/series
index 6a1c7f5..7d366fc 100644
--- a/patches/linux-3.9/series
+++ b/patches/linux-3.9/series
@@ -1,5 +1,6 @@
# keep in sync with stable
patch-3.9.1.bz2
+patch-3.9.1-2.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 26abdce..492955d 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 = 1
+ SUBLEVEL = 2
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Unicycling Gorilla