diff options
author | Juergen Beisert <jbe@pengutronix.de> | 2011-11-23 08:44:05 +0100 |
---|---|---|
committer | Juergen Beisert <jbe@pengutronix.de> | 2011-11-23 08:44:05 +0100 |
commit | 497070799549262e1a59967d2abd0a682b13979b (patch) | |
tree | 1bb37e7b247718d82ca068e14aec0f31ee6abe4e | |
parent | 6517b96e1eb832a604bc2c6871432dd17c99a4bc (diff) | |
download | OSELAS.BSP-Pengutronix-Mini6410-497070799549262e1a59967d2abd0a682b13979b.tar.gz OSELAS.BSP-Pengutronix-Mini6410-497070799549262e1a59967d2abd0a682b13979b.tar.xz |
Kernel-3.0: keep in sync with stable release 3.0.10
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
6 files changed, 10 insertions, 4 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index efa817f..c8617c9 100644 --- a/configs/platform-friendlyarm-mini6410/Changelog +++ b/configs/platform-friendlyarm-mini6410/Changelog @@ -1,3 +1,8 @@ +2011-11-23 Juergen Beisert <jbe@pengutronix.de> + + * Kernel 3.0: + - keep in sync with stable release .10 + 2011-11-12 Juergen Beisert <jbe@pengutronix.de> * Platform: diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.0 index d0a2a70..a0ab8f6 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.9-ptx-master Kernel Configuration +# Linux/arm 3.0.10-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.9-10.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.9-10.bz2 Binary files differnew file mode 100644 index 0000000..100db5a --- /dev/null +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/patch-3.0.9-10.bz2 diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series index 2919386..3c6c4cf 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.0/series @@ -8,6 +8,7 @@ patch-3.0.5-6 patch-3.0.6-7 patch-3.0.7-8.bz2 patch-3.0.8-9.bz2 +patch-3.0.9-10.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 8089f21..06fe205 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 = 9 + SUBLEVEL = 10 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = Sneaky Weasel diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index b2058f0..2e2e105 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -32,8 +32,8 @@ they are also available. Here is a list of currently available Linux kernel releases in the \ptxdistBSPName{}: \begin{itemize} - \item 3.1, stable patch level 1 (defaultl) - \item \curKernelRev{}, stable patch level 9 + \item \curKernelRev{}, stable patch level 1 (defaultl) + \item 3.0, stable patch level 10 \item 2.6.39, stable patch level 4 \end{itemize} |