diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2011-12-11 17:30:48 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2012-07-17 16:52:51 +0200 |
| commit | 6e1306027c6ba790c08163800745a7b8478c939b (patch) | |
| tree | e4b2274610a9693dd187e748e56c50b52545181a | |
| parent | ab0e74d2853c8f8648a7fb0e387440fa27c21d89 (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini6410-6e1306027c6ba790c08163800745a7b8478c939b.tar.gz OSELAS.BSP-Pengutronix-Mini6410-6e1306027c6ba790c08163800745a7b8478c939b.tar.xz | |
Kernel-3.0: Keep in sync with stable release 3.0.13
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
6 files changed, 9 insertions, 3 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index aa8cc12..c4225aa 100644 --- a/configs/platform-friendlyarm-mini6410/Changelog +++ b/configs/platform-friendlyarm-mini6410/Changelog @@ -1,3 +1,8 @@ +2011-12-11 Juergen Beisert <jbe@pengutronix.de> + + * Kernel 3.0: + - keep in sync with stable release .13 + 2011-12-04 Juergen Beisert <jbe@pengutronix.de> * Kernel 3.1: diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 index 78be30d..7e81db1 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.12-ptx-master Kernel Configuration +# Linux/arm 3.0.13-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.12-13.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.12-13.bz2 Binary files differnew file mode 100644 index 0000000..532ca19 --- /dev/null +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.12-13.bz2 diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series index 7301830..f5615aa 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series @@ -11,6 +11,7 @@ patch-3.0.8-9.bz2 patch-3.0.9-10.bz2 patch-3.0.10-11.bz2 patch-3.0.11-12.bz2 +patch-3.0.12-13.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 5fdcc94..077a232 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 = 12 + SUBLEVEL = 13 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Sneaky Weasel diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 8a54994..ca57f20 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 4 (defaultl) - \item 3.0, stable patch level 12 + \item 3.0, stable patch level 13 \item 2.6.39, stable patch level 4 \end{itemize} |