diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2011-11-23 08:47:20 +0100 |
|---|---|---|
| committer | Juergen Beisert <jbe@pengutronix.de> | 2011-11-23 08:47:20 +0100 |
| commit | d28e8518a00cc27ebd5f1c62242bacfa3f19dc64 (patch) | |
| tree | 42381bd1130e365a2d4726a9e701bc7c0c3752ca | |
| parent | 497070799549262e1a59967d2abd0a682b13979b (diff) | |
| download | OSELAS.BSP-Pengutronix-Mini6410-d28e8518a00cc27ebd5f1c62242bacfa3f19dc64.tar.gz OSELAS.BSP-Pengutronix-Mini6410-d28e8518a00cc27ebd5f1c62242bacfa3f19dc64.tar.xz | |
Kernel-3.1: keep in sync with stable release 3.1.2
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
6 files changed, 6 insertions, 3 deletions
diff --git a/configs/platform-friendlyarm-mini6410/Changelog b/configs/platform-friendlyarm-mini6410/Changelog index c8617c9..232b87a 100644 --- a/configs/platform-friendlyarm-mini6410/Changelog +++ b/configs/platform-friendlyarm-mini6410/Changelog @@ -2,6 +2,8 @@ * Kernel 3.0: - keep in sync with stable release .10 + * Kernel 3.2: + - keep in sync with stable release .2 2011-11-12 Juergen Beisert <jbe@pengutronix.de> diff --git a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 index 1f30a2a..9b622b4 100644 --- a/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 +++ b/configs/platform-friendlyarm-mini6410/kernelconfig-3.1 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.1.1-ptx-master Kernel Configuration +# Linux/arm 3.1.2-ptx-master Kernel Configuration # CONFIG_ARM=y CONFIG_HAVE_PWM=y diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.1-2.bz2 b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.1-2.bz2 Binary files differnew file mode 100644 index 0000000..10373b9 --- /dev/null +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/patch-3.1.1-2.bz2 diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series index 716c221..5256ec5 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/series @@ -1,5 +1,6 @@ # keep in sync with stable releases patch-3.1.1.bz2 +patch-3.1.1-2.bz2 # some fixes, occured on LKML/ALKML PATCH_2_3_rtc-s3c_Disable_alarm_entries_that_are_not_chosen.diff diff --git a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff index 6098c45..29895ae 100644 --- a/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff +++ b/configs/platform-friendlyarm-mini6410/patches/linux-3.1/set-marker.diff @@ -9,7 +9,7 @@ Index: linux-3.1/Makefile @@ -1,7 +1,7 @@ VERSION = 3 PATCHLEVEL = 1 - SUBLEVEL = 1 + SUBLEVEL = 2 -EXTRAVERSION = +EXTRAVERSION = -ptx-master NAME = "Divemaster Edition" diff --git a/documentation/plain_sources/special_notes.tex b/documentation/plain_sources/special_notes.tex index 2e2e105..e15bdfe 100644 --- a/documentation/plain_sources/special_notes.tex +++ b/documentation/plain_sources/special_notes.tex @@ -32,7 +32,7 @@ they are also available. Here is a list of currently available Linux kernel releases in the \ptxdistBSPName{}: \begin{itemize} - \item \curKernelRev{}, stable patch level 1 (defaultl) + \item \curKernelRev{}, stable patch level 2 (defaultl) \item 3.0, stable patch level 10 \item 2.6.39, stable patch level 4 \end{itemize} |