summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2011-12-02 18:09:18 +0100
committerJuergen Beisert <jbe@pengutronix.de>2012-07-17 16:52:51 +0200
commit6a8ef5318a65e9a0caed4e5e20d704f4aa173330 (patch)
treec018fba06969c13c165e5459c2c8e0ed593b5cdd
parent91f455bd81269f658f2f22ccab20236e7685582c (diff)
downloadOSELAS.BSP-Pengutronix-Mini6410-6a8ef5318a65e9a0caed4e5e20d704f4aa173330.tar.gz
OSELAS.BSP-Pengutronix-Mini6410-6a8ef5318a65e9a0caed4e5e20d704f4aa173330.tar.xz
Kernel-3.0: Keep in sync with stable release 3.0.12
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.11-12.bz2bin0 -> 699 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
6 files changed, 9 insertions, 3 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog
index e6cc1c4..e5b3696 100644
--- a/configs/platform-friendlyarm-mini6410/Changelog
+++ b/configs/platform-friendlyarm-mini6410/Changelog
@@ -1,3 +1,8 @@
+2011-12-02 Juergen Beisert <jbe@pengutronix.de>
+
+ * Kernel 3.0:
+ - keep in sync with stable release .12
+
2011-11-28 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 d2051d8..78be30d 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.11-ptx-master Kernel Configuration
+# Linux/arm 3.0.12-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.11-12.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.11-12.bz2
new file mode 100644
index 0000000..fe58b87
--- /dev/null
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.11-12.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 fd802bd..7301830 100644
--- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
+++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series
@@ -10,6 +10,7 @@ patch-3.0.7-8.bz2
patch-3.0.8-9.bz2
patch-3.0.9-10.bz2
patch-3.0.10-11.bz2
+patch-3.0.11-12.bz2
# this patch was intended for YAFFS users, but also JFFS2 uses the OOB area
PATCH_nand_base_Always_initialise_oob_poi_before_writing_OOB_data.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 450664a..5fdcc94 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 = 11
+ SUBLEVEL = 12
-EXTRAVERSION =
+EXTRAVERSION = -ptx-master
NAME = Sneaky Weasel
diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex
index f4db6e5..9ef7a1f 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 3 (defaultl)
- \item 3.0, stable patch level 11
+ \item 3.0, stable patch level 12
\item 2.6.39, stable patch level 4
\end{itemize}