summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2012-07-20 09:27:18 +0200
committerJuergen Beisert <jbe@pengutronix.de>2012-07-20 09:27:18 +0200
commitc8dec78f15819d195a61e983321967b1c68e6ed0 (patch)
treeb72c5381610c157796b54d015b7eda18299fde69
parentc32d6e7d1258dbd134fae9bb36d9c41846866005 (diff)
downloadOSELAS.BSP-Pengutronix-Mini6410-c8dec78f15819d195a61e983321967b1c68e6ed0.tar.gz
OSELAS.BSP-Pengutronix-Mini6410-c8dec78f15819d195a61e983321967b1c68e6ed0.tar.xz
Kernel-3.0: Keep in sync with stable release 3.0.38
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-rw-r--r--configs/platform-friendlyarm-mini6410/Changelog5
-rw-r--r--configs/platform-friendlyarm-mini6410/kernelconfig-3.02
-rw-r--r--configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.37-38.bz2bin0 -> 8225 bytes
-rw-r--r--configs/platform-friendlyarm-mini6410/patches/linux-3.0/series1
-rw-r--r--configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff2
-rw-r--r--documentation/plain_sources/special_notes.tex2
-rw-r--r--protocol/acceptance-test.txt2
7 files changed, 10 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog
index 49c7d63..8dbe425 100644
--- a/configs/platform-friendlyarm-mini6410/Changelog
+++ b/configs/platform-friendlyarm-mini6410/Changelog
@@ -1,3 +1,8 @@
+2012-07-20 Juergen Beisert <jbe@pengutronix.de>
+
+ * Kernel 3.0:
+ - keep in sync with stable release .38
+
2012-07-17 Juergen Beisert <jbe@pengutronix.de>
* Kernel 3.0:
diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0
index c68bf11..050fd90 100644
--- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0
+++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/arm 3.0.37-ptx-master Kernel Configuration
+# Linux/arm 3.0.38-ptx-master Kernel Configuration
#
CONFIG_ARM=y
CONFIG_HAVE_PWM=y
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.37-38.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.37-38.bz2
new file mode 100644
index 0000000..379c42f
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.37-38.bz2
Binary files differ
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
index a0496ca..acbf144 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
@@ -36,6 +36,7 @@ patch-3.0.33-34.bz2
patch-3.0.34-35.bz2
patch-3.0.35-36.bz2
patch-3.0.36-37.bz2
+patch-3.0.37-38.bz2
# some fixes, occured on LKML/ALKML
PATCH_1_3_rtc-s3c_Correct_debug_messages.diff
diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff
index 9d6d06f..e8accf5 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/set-marker.diff
+++ b/configs/platform-friendlyarm-mini6410/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 = 37
+ SUBLEVEL = 38
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Sneaky Weasel
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index dc8e1e3..dcc58f8 100644
--- a/documentation/plain_sources/special_notes.tex
+++ b/documentation/plain_sources/special_notes.tex
@@ -33,7 +33,7 @@ releases in the \ptxdistBSPName{}:
\begin{itemize}
\item \curKernelRev{}, stable patch level 10 (defaultl)
- \item 3.0, stable patch level 37
+ \item 3.0, stable patch level 38
\item 2.6.39, stable patch level 4
\end{itemize}
diff --git a/protocol/acceptance-test.txt b/protocol/acceptance-test.txt
index 7c3754d..6539536 100644
--- a/protocol/acceptance-test.txt
+++ b/protocol/acceptance-test.txt
@@ -27,7 +27,7 @@ Base System
-----------
[ ] kernel-3.1.10 is a release
-[ ] kernel-3.0.37 is a release
+[ ] kernel-3.0.38 is a release
[x] kernel-2.6.39.4 is a release
[x] u-boot-1.1.6 is a release