summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2013-03-20 22:03:32 +0100
committerJuergen Beisert <jbe@pengutronix.de>2013-06-12 12:14:05 +0200
commit3d72ef35c2ff7ab6954f02a2b26e837cad8b48ac (patch)
tree9477062db18ff563b464e4ecd8a1e5ef154e00ea
parentc244b0b12c296b51d3e386d2b41c38f5b437adee (diff)
downloadOSELAS.BSP-Pengutronix-Mini2440-3d72ef35c2ff7ab6954f02a2b26e837cad8b48ac.tar.gz
OSELAS.BSP-Pengutronix-Mini2440-3d72ef35c2ff7ab6954f02a2b26e837cad8b48ac.tar.xz
Kernel-3.0: keep in sync with stable release 3.0.70
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--Changelog5
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--kernelconfig-3.02
-rw-r--r--patches/linux-3.0/patch-3.0.69-70.bz2bin0 -> 10861 bytes
-rw-r--r--patches/linux-3.0/series1
-rw-r--r--patches/linux-3.0/set-marker.diff2
6 files changed, 9 insertions, 3 deletions
diff --git a/Changelog b/Changelog
index e89252a..090fcdb 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,8 @@
+2013-03-20 Juergen Beisert <jbe@pengutronix.de
+
+ * Kernel 3.0:
+ - keep in sync with stable release .70
+
2013-03-17 Juergen Beisert <jbe@pengutronix.de
* Kernel 3.0:
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index 9230a84..364a4f5 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -40,7 +40,7 @@ list of currently available Linux kernel releases in the \ptxdistBSPName{}:
\item 3.3 *), stable patch level 8
\item 3.2, stable patch level 40
\item 3.1 *), stable patch level 10
- \item 3.0, stable patch level 69
+ \item 3.0, stable patch level 70
\item 2.6.39 *), stable patch level 4
\item 2.6.38 *), stable patch level 8
\end{itemize}
diff --git a/kernelconfig-3.0 b/kernelconfig-3.0
index d203e15..bebca21 100644
--- a/kernelconfig-3.0
+++ b/kernelconfig-3.0
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.69-ptx-master Kernel Configuration
+# Linux/arm 3.0.70-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/patches/linux-3.0/patch-3.0.69-70.bz2 b/patches/linux-3.0/patch-3.0.69-70.bz2
new file mode 100644
index 0000000..87fa695
--- /dev/null
+++ b/patches/linux-3.0/patch-3.0.69-70.bz2
Binary files differ
diff --git a/patches/linux-3.0/series b/patches/linux-3.0/series
index 60d8c0b..92ffa02 100644
--- a/patches/linux-3.0/series
+++ b/patches/linux-3.0/series
@@ -68,6 +68,7 @@ patch-3.0.65-66.bz2
patch-3.0.66-67.bz2
patch-3.0.67-68.bz2
patch-3.0.68-69.bz2
+patch-3.0.69-70.bz2
PATCH_1_4_s3c2440_mini2440_Add_support_for_new_LCD_panels.diff
add_lcd_w35i.diff
diff --git a/patches/linux-3.0/set-marker.diff b/patches/linux-3.0/set-marker.diff
index 6e2ada3..ab68548 100644
--- a/patches/linux-3.0/set-marker.diff
+++ b/patches/linux-3.0/set-marker.diff
@@ -9,7 +9,7 @@ Index: linux-3.0/Makefile
@@ -1,7 +1,7 @@
VERSION = 3
PATCHLEVEL = 0
- SUBLEVEL = 69
+ SUBLEVEL = 70
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Sneaky Weasel